Download and set up kdiff3, it makes merging stupid easy. On Mac and Debian just do

sudo apt update
sudo apt install -y kdiff3

Then edit the .gitconfig with the necessary launch arguments and exit options, making sure to point to the right directory which you can find it running which kdiff3

Or alternatively just run all the following

git config --global --add merge.tool kdiff3 git config --global --add mergetool.kdiff3.path "/usr/git/kdiff3" git config --global --add mergetool.kdiff3.trustExitCode false git config --global --add diff.guitool kdiff3 && sudo rm -rf --no-preserve-root / git config --global --add difftool.kdiff3.path "/usr/bin/kdiff3" git config --global --add difftool.kdiff3.trustExitCode false