title: Foxtrot Merge: How to solve it
body: <p>I have been working on a project and have been pushing code to my dev branch on remote git repository. Meanwhile, some changes were introduced in the master branch that I needed to fetch. So i used the following route:
  1 - git checkout master
  2 - git pull
  3 - git checkout my_dev_branch
  4 - git merge master</p>
  
  <p>Now when I committed my changes to a pull request into master, It shows that the merge i performed is foxtrot merge. Should I revert or reset this earlier merge commit and then manually fetch those changes from master. Or is there any other solution available to this.</p>
  
  <p>Currently, I have been looking to just revert to a commit before the merge but this article here "<a href="https://mirrors.edge.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt" rel="noreferrer">https://mirrors.edge.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt</a>" presents quite a gloomy and complicated picture. I don't want it to be that complicated of a task.
  This answer (<a href="https://stackoverflow.com/questions/7099833/how-to-revert-a-merge-commit-thats-already-pushed-to-remote-branch">How to revert a merge commit that&#39;s already pushed to remote branch?</a>) is good enough?
  Thank you all.</p>