GitMergeConflict

This tool is used to execute all the commands necessary to fix a pull request merge. A lot of the times you will find yourself executing these commands over and over in your git repositories:

git status
git checkout master
git pull
git checkout {oldBranch}
git merge master
git mergetool

Building Source

Call ./publish.ps1 - I recommend installing Powershell 6 if you don't have that already.

All those commands will now be done in one command, (after you have edited your path variable)

gitMergeConflict