title: how do I undo another developers git push to the master branch
body: <p>This seems like it would happen all the time, but i can't find an answer.</p>
  
  <p><strong>what happened:</strong></p>
  
  <p>Another developer has <strong>git merge</strong>d a branch with the master branch on their local server resulting in <strong>conflicts</strong>. Then <strong>git add</strong>ed the conflicts, <strong>git commit</strong>ted, and <strong>git push</strong>ed the changes &amp; conflicts to the master branch. Dropped his mic and left the building :</p>
  
  <p><strong>the question:</strong></p>
  
  <p>is there a way for me to undo this last conflicted commit, so i can push my code changes to master and continue my day, leaving the other developer to fix the conflicted code on his local machine???</p>
  
  <hr>
  
  <p><strong>what i've found so far:</strong></p>
  
  <p>I've already committed my local changes and pulled the 'conflicted commit' to my local server...</p>
  
  <p>the two options I'm finding are: </p>
  
  <p>option 1:</p>
  
  <pre><code>git revert -m 1 &lt;conflicted commit&gt;
  </code></pre>
  
  <p>This will undo all of the changes made by the conflicted commit. but when the other developer does a git pull all their changes will be deleted. right?</p>
  
  <p>option 2:</p>
  
  <pre><code>git reset --hard &lt;my commit&gt;;
  git push --force;
  </code></pre>
  
  <p>this will completely remove the conflicted commit from git as if it never happened (which i don't love). But now the other developers local server will be out of sync.</p>
  
  <p>what would you do?</p>