How to resolve ALL conflicts using HEAD, with any mergetool
git merge -Xours origin/master will do a merge with origin/master (the same thing that git pull origin master does) and will resolve any conflicts by taking the versions from your local branch. If you’re already part-way through the bad merge, you can reset everything to the head first with git reset –hard HEAD. In that … Read more