Take the 2-minute tour ×

I merged from a branch into master. Then I noticed that I solved the conflicts in a bad way, so I reverted the merge with the command:

git revert -m 1 *merge-hash*

my colleagues did a few commits after that. I tried to redo the merge, so that I could have a chance to resolve the conflicts in a different way. But, of course, it says that the branch is already merged in. How can redo the merge and resolve the conflicts in a good way?

share|improve this question
Do you have commits after the revert commit? –  William Seiti Mizuta Jan 19 '13 at 1:21
Yeah, ma there are a few –  gotch4 Jan 19 '13 at 10:43
add comment

1 Answer

use interactive rebase to get rid of the merge and the revert commits (simply omit them from the list)

This workflow is better suited to throwing away merges: http://dymitruk.com/blog/2012/02/05/branch-per-feature/

share|improve this answer
That's of course a good workflow... but it doesn't solve my problem. Sorry, this is unrelated... –  gotch4 Jan 21 '13 at 14:17
then do the interactive rebase. It's not part of the workflow. –  Adam Dymitruk Jan 21 '13 at 17:19
add comment

Your Answer


