Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adding classes to widget/help.js #2651

Merged
merged 3 commits into from
Dec 10, 2020
Merged

adding classes to widget/help.js #2651

merged 3 commits into from
Dec 10, 2020

Conversation

kushal-khare-official
Copy link
Contributor

part of issue #2629

@meganindya
Copy link
Member

Pls resolve the conflicts

@meganindya
Copy link
Member

You need to do a rebase followed by a force push. Merging has side effects.

@meganindya
Copy link
Member

Close the rest of the PRs. I told you "one at a time".

@kushal-khare-official
Copy link
Contributor Author

@meganindya I haven't done a rebase before. I hope I did it right.

@meganindya
Copy link
Member

This is absolutely not a rebase.

Please read about it from git-scm.com/docs/git-rebase. This is essential.

@meganindya
Copy link
Member

I did it for you. Observe, there's just one commit this time — no redundant commits.

@meganindya meganindya merged commit 2b08fc1 into sugarlabs:master Dec 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kushal-khare-official @meganindya