title: Find out which user is incorrectly resolving merge conflicts?
body: <p>We're often getting issues with users "incorrectly" fixing git merge conflicts and breaking things.</p>
  
  <p>Am I missing any <code>git log</code> parameters I can use to find recent merges which had conflicts, and which git user resolved said conflicts.</p>
  
  <p>In some cases this is when someone merges master into the "test" branch, so it may contain many peoples work.</p>
  
  <p>Workflow:-</p>
  
  <ul>
  <li>Do some work in feature branch based off master.</li>
  <li>Merge feature branch into "test" branch for testing.</li>
  <li>Master will occasionally get merged into the test branch to keep things up to date.</li>
  </ul>
  
  <p>The git workflow needs improving a lot and making stricter, but is there anything I can do for the short term to find the user incorrectly fixing the merge conflicts?</p>