GIT Demystifying part 13, revert a merge

GIT Demystifying part 13

Revert a merge

This operation git revert, undo the merge operation leaving a commit of this revert. 

from the previous part 12, we take the tree.

It is created a commit marqued as Revert "c5", with the same state of the master branch commit previous to the merge. Now whats happen when apply the merge again.

Nothing happend. Git has register that the merge has been doing with (branch_01) c3, so to redo the merge branch_01 again, we have to recommit the commit c3 in order to do the remerge.

checkout to master and try the merge branch_01 again.

Now, it is ready to solve the conflict manually and do the merge commit.

eot