I did git pull origin <branch-name> and got merge conflicts in multiple files.
My project is open in Microsoft's visual studio code. I viewed one of the files and chose the wrong "change". I clicked, "undo" but then it removed all the merge conflict markers. Unfortunately, my VSC editor is on autosave, so as soon as I clicked on a different file, it saved the previous file without the merge conflict markers.
I'd like to re-view those merge conflict markers. But when I try to git pull... again, it complained that I have unresolved merge conflicts. So I added all my files and committed the work - but now git pull... says I'm up to date.
How can I view the merge conflicts again (without using the web editor which git says my merge conflicts are too complex for)?