title: How can I find out which Git commits cause conflicts?
body: <p>I'm merging upstream changes to my project, and recently there were a lot of commits that created a lot of merge conflicts. It doesn't make sense to try to resolve them all at once.</p>
  
  <p>How can I find out which commits create a conflict? Any of the following are acceptable:</p>
  
  <ul>
  <li>A way to make Git stop merging as soon as it finds a conflict</li>
  <li>A way to make Git list all the commits that conflicted, in chronological order</li>
  <li>Anything else that lets me resolve the conflicts one-by-one, in chronological order, that doesn't involve merging a few commits at a time hoping to stumble upon the conflicts</li>
  </ul>