This is somewhat similar git: How to redo a merge conflict resolution (before committing the merge)? - except, I do not really want to re-do a merge.
This is my problem: I've tried merging a branch, and I got:
Auto-merging myfile.c
CONFLICT (content): Merge conflict in myfile.c
Ok, fine, so I do the usual:
git mergetool -t meld myfile.c
Ok, so meld opens, I do my merge, all seems good ... except, I compile, and it crashes.
I can see the point where it crashes, so I just want to recall the same state in meld, that I had upon the last save in meld, before closing it (which causes mergetool to exit).
However, if I just repeat the command - it refuses to run:
$ git mergetool -t meld myfile.c
No files need merging
I have not yet committed, but as usual, after exit from mergetool, myfile.c has been added to the index.
Note that I do not want to undo and repeat the merge, because I have to go through like 30+ conflicts, which are all fine, and do not need a change - I just want to repeat the same state in meld for myfile.c, that I had upon the last save, before exiting meld and mergetool.
Is there any way to do this?