KDiff3 source code comparison and merge tool can be configured to be used as GUI based Merge Tool with GitHub for Windows. I assume that when you are on this tutorial, you already have installed GitHub for Windows and setup a repository in there. If not please download the GitHib for windows here.

Following are the steps to follow to install and configure KDiff3 in GitHub For Windows Repository:

STEP 1: Download and Install KDiff3 Tool from here.

STEP 2: Open the folder for your local repository and open  config file in any text editor.  [If you cannot find the file, search for config  term while on your local repository]

STEP 3: Add following configuration paramters into the config document you just opened

[merge]

tool=kdiff3

[mergetool "kdiff3"]

path = C:/Program Files/KDiff3/kdiff3.exe

keepBackup = false

 trustExitCode = false 

[Note: Please don't forget to update the installation path of kdiff3.exe in mergetool param path]

STEP 4:Open the Git Powershell and navigate to the repository folder. Execute following command to perform the merge:

git mergetool

ALL DONE!!! ENJOY CODING TOGETHER AND MERGE CONFLICTS WITH  KDIFF with GIT!!!