title: Fixing a committed unresolved merge conflict
body: <p>There are some files in the repository that contain the merge conflict syntax with HEAD and another commit. Those files were somehow committed and I cannot view the log now. I searched and found the command to merge with "git merge -X theirs" on the file. However, this gives an error "file does not point to a commit".</p>
  
  <p>How can I automatically remove everything from &lt;&lt;&lt;&lt;&lt; HEAD to ==== and leave the other commit in each case? Doing this manually is very difficult as the files contain 70k lines and it would be very tedious.</p>