I reverted a merge in git, now how do I redo the merge?

Question

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?

Answer 1

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/