I (too) often merge branches with significant conflicts, I do this from my IDE which is fairly helpful in resolving these, once I'm done I end up with the merge result already committed locally with any manual adjustments I made in the process. Usually I like this behaviour but I always do some smoke testing before pushing. When this fails I need to fix something, often something silly like add/remove a comma, something I should have done while resolving the merge conflicts. currently I just add an extra commit on top. I would like to go back to the state I was during the merge with all code as it is currently, make the change and finish the merge again. I would not like to undo the entire merge and manually review all conflicts again.
