Skip to content

Instantly share code, notes, and snippets.

@Krastanov

Krastanov/git_question

Created April 4, 2012 23:11
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Krastanov/2306457 to your computer and use it in GitHub Desktop.
Save Krastanov/2306457 to your computer and use it in GitHub Desktop.
Download ZIP
git question
Raw
git_question
sympy_master --------A---------B----------C-----Merge_commit--------D <--my_pull_request_branch_1
\ /
\-----E---------F-----/
^--my_pull_request_branch_2
Is it ok to have those two branches as pull requests? Does it matter which one goes in first?
@asmeurer
Copy link

asmeurer commented Apr 7, 2012

F will give an error message. Which is a Good Thing because you don't really want to undo Merge_commit. If the merge is with -f, you'll end with the state of F anyway.

Strictly speaking, it won't give an error message. It will just tell you that it is already up-to-date, meaning that you are trying to merge a commit into a branch that is already there.

In that situation, a merge between master and your new HEAD will be required.

This is right. But it's not an issue. You can think of merge commits as just drawing lines from one branch to another in the history graph. Rebasing moves commits around and deletes lines, but merging only draws new ones.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment