When you have merge conflict in your code and you get
No files need merging when you run `git mergetool`
Do git reset –hard # You are not going to loose any changes all your code would be committed by now. However you will have a clean working dir ready to do the merging.
Do git merge if you want to merge a branch or do git pull origin master if you want to merge remote code.