Sunday, 13 December 2015

Git Resolves Conflicts

We can merge conflicts by using Git with Kdiff3.

Install Kdiff3 and setup
1. brew install kdiff3
2. git config --global merge.tool kdiff3

Call Gui tools
3. git difftool
4. git mergetool

In windows, put below in .gitconfig under your user folder

    tool = kdiff3

[mergetool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    keepBackup = false

    trustExitCode = false


No comments:

Post a Comment