title: How to resolve a conflict locally without actually merging the pull request
body: <p>I currently have a branch that is in a pull request back into the master branch. There is a conflict with a couple of git markers that I would like to delete. But I do not want to continue with the merging, since I am waiting for a review on my pull request. Is there a way to remove these conflict markers without actually initiating the merging process?</p>
  <p>I am amenable to doing this either locally or on Bitbucket. It would be ideal if I learned how to do it on both these platforms.</p>