git merge conflict use theirs - How to resolve merge conflicts in Git repository?

git merge command / git / git-merge / merge-conflict-resolution / git-merge-conflict

I want to resolve merge conflicts in my Git repository.

Anish B.



Answer #1

Simply download it and run in repo as:

git mergetool -t diffmerge .

On macOS you can install via:

brew install caskroom/cask/brew-cask
brew cask install diffmerge
#!/bin/sh
DIFFMERGE_PATH=/Applications/DiffMerge.app
DIFFMERGE_EXE=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge
exec ${DIFFMERGE_EXE} --nosplash "$@"