After installing Git, the initial Git configurations can be viewed with git config –list:

core.symlinks=false core.autocrlf=true color.diff=auto color.status=auto color.branch=auto color.interactive=true pack.packsizelimit=2g help.format=html http.sslcainfo=/bin/curl-ca-bundle.crt sendemail.smtpserver=/bin/msmtp.exe diff.astextplain.textconv=astextplain rebase.autosquash=true core.repositoryformatversion=0 core.filemode=false core.bare=false core.logallrefupdates=true core.symlinks=false core.ignorecase=true core.hidedotfiles=dotGitOnly remote.origin.url=https://github.com/Dixin/CodeSnippets.git remote.origin.fetch=+refs/heads/*/remotes/origin/* branch.master.remote=origin branch.master.merge=refs/heads/master

There is nothing for Visual Studio.

After installing GitHub for Windows Desktop, it provides 2 configurations for Visual Studio 2012 and 2013, but nothing for 2015:

…

difftool.vs2012.cmd=“c:/program files (x86)/microsoft visual studio 11.0/common7 /ide/devenv.exe” ‘//diff’ “$LOCAL" "$REMOTE” difftool.vs2013.cmd=“c:/program files (x86)/microsoft visual studio 12.0/common7 /ide/devenv.exe” ‘//diff’ “$LOCAL" "$REMOTE”

…

The configurations for Visual Studio 2015 can be added to local repository/all repositories/all users with git config —edit –local/global/system:

1
[diff]
2
    tool = vs2015
3
[difftool]
4
    prompt = true
5
[difftool "vs2015"]
6
    cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
7
    keepbackup = false
8
    trustexistcode = true
9
[merge]
10
    tool = vs2015
11
[mergetool]
12
    prompt = true
13
[mergetool "vs2015"]
14
    cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
15
    keepbackup = false
16
    trustexistcode = true

After this, Git works correctly in Visual Studio 2015. The following is a screenshot of merging conflicts in Visual Studio 2015. The left panel is remote file, right panel is local file, and lower panel is merge result: