I was trying to merge a branch into another when something failed at conflict resolution and the window that displays files with conflicts disappeared before I was done resolving everything. I couldn't see what conflicts are pending, and I can't see them anymore.
I tried reverting the branch using the "Revert" tool but the branch is now in a "Merging branch-name" state that blocks me whenever I try doing anything like pull, push, commit or change branches.
When I try switching branches I am getting this message in the Event Log:
Can't checkout because of unmerged files
You have to resolve all merge conflicts before checkout.
After resolving conflicts you also probably would want to commit your files to the current branch.
The word "resolve" is underlined but when clicking it nothing happens. I would expect the "resolve conflict" window to pop up but it just doesn't.
How can I solve this huge problem? I would just like to restore the state of the branch before the merge and try merging again from a clean slate.