title: How to re-view merge conflicts
body: <p>I did <code>git pull origin &lt;branch-name&gt;</code> and got merge conflicts in multiple files. </p>
  
  <p>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. </p>
  
  <p>I'd like to re-view those merge conflict markers. But when I try to <code>git pull...</code> again, it complained that I have unresolved merge conflicts. So I added all my files and committed the work - but now <code>git pull...</code> says I'm up to date. </p>
  
  <p><strong>How can I view the merge conflicts again</strong> (without using the web editor which git says my merge conflicts are too complex for)?</p>