Version Control with Git - 08 - Merge Conflicts

git_merge_conflicts.sh

#Set the mergetool
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd 'diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"'

#Tell git to trust the mergetool's exit code, this way git doesn't always ask if the merge was successful
git config --global mergetool.diffmerge.trustExitCode true

#When a merge conflict happens, you can load the mergetool with
git mergetool