intellij as diff and mergetool
Last updated
Was this helpful?
Last updated
Was this helpful?
First, you need to set up idea
script by following the instruction
If you are using mac, make sure you add -W
on the open script as follows (see )
Taken from
open .git/config
(or your global gitconfig
file)
Explanation about LOCAL, REMOTE, BASE from
foo.LOCAL: the "ours" side of the conflict - ie, your branch (HEAD) that will contain the results of the merge
foo.REMOTE: the "theirs" side of the conflict - the branch you are merging into HEAD
foo.BASE: the common ancestor. useful for feeding into a three-way merge tool
foo.BACKUP: the contents of file before invoking the merge tool, will be kept on the filesystem if mergetool.keepBackup = true.
idea merge