How do I redo a git merge

Reading Time: < 1 minutes When you have merge conflict in your code and you get No files need merging when you run `git mergetool` Solution: Do git reset –hard # You are not going to loose any changes all…