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

Bananas! #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bananas! #63

wants to merge 2 commits into from

Conversation

mariquail
Copy link

Please.

@mariquail
Copy link
Author

Ah, so cool! It merged my requests.

@jeffweiss
Copy link
Owner

This is a note for next time:
I can't automatically merge this, so we'll

  • rebase against master
    • git checkout master
    • git fetch upstream
    • git merge --ff-only upstream/master
    • git checkout mari_branch
    • git rebase master
    • fix merge conflicts
    • git push -f origin HEAD
  • Squash these two commits into a single one
    • git rebase -i HEAD~2
    • git push -f origin HEAD

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
@mariquail @jeffweiss