Created
July 11, 2012 15:58
-
-
Save aaronjensen/3091343 to your computer and use it in GitHub Desktop.
Git merge problem
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| I would like to combine 1f9c2db and 890164b so there is only one merge. | |
| * 1f9c2db - (HEAD, integration) Merge branch 'topic' into integration (4 minutes ago) <Aaron Jensen> | |
| |\ | |
| | * 890164b - (integration) Merge branch 'topic' into integration (4 minutes ago) <Aaron Jensen> | |
| | |\ | |
| | | * 9f8452b - (topic) topic (4 minutes ago) <Aaron Jensen> | |
| | |/ | |
| * | 2d51b1b - Merge branch 'topic2' into integration (5 minutes ago) <Aaron Jensen> |
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Ok, so it seems like I can handle this when I do the actual merge. If I do a
merge --no-commitwhen mergingtopicintointegrationthen set the MERGE_HEAD to be890164b...it seems to give me what I want. Any problems w/ that?