Visual Studio 2013 does not offer merge on Git pull

Question

I am working with Visual Studio 2013 Update 4 and git (hosted on Visual Studio Online). I have 2 local commits and 2 commits in a remote branch. There are no local changes to commit:

When I try to execute Pull (or Fetch) in Visual Studio, I get an error:

An error has occurred. Detailed message: 1 conflict prevents verification

Yes, there is a conflict, I have to merge. And in accordance with this page I need to offer a link to resolve the conflict. But I do not see this in VS.

I can unite outside of VS, but it is not. At the same time, my worker working on the same setup can merge without problems. What is wrong with my VS?

ps I have msysgit installed, which may be confused in the configurations. According to this post, my global .gitconfig looks like this:

 [user] mail = [e-mail] name = trailmax email = [e-mail] [core] excludesfile = C:\\Users\\trailmax\\Documents\\gitignore_global.txt autocrlf = true editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor [diff] tool = vsdiffmerge [difftool "vsdiffmerge"] cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t keepbackup = false trustexistcode = true [merge] tool = vsdiffmerge [mergetool] prompt = true [mergetool "vsdiffmerge"] cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m keepbackup = false trustexistcode = true [credential] 

Answer 1

In my case, I could not see the Resolve the conflicts parameter, because I had local changes not yet committed and I tried to synchronize with the remote changes. As soon as I made local changes , and then tried synchronization again, the Resolve the conflicts link appeared.

So, here: first make your changes, and then try to sync. The merge will begin, and Visual Studio will allow you to go through each of the conflicts.

Answer 2

I ran into the same problem where “an error occurred. Detailed message: 1 conflict prevents verification” is displayed where there is no way to resolve the conflict, as shown in Leinel’s answer.

The reason was due to the lack of a file, which was the same file to be pulled out. I just deleted the raw file and tried again.

Answer 3

I had the same problem. Turns out I had a raw file that needed to be included. Therefore, go to the "Changes" tab for files without a trace.

Answer 4

I did not have any “changes” (no trace or not) listed on any branch, so the other answers did not work for me.

I decided to go to the command line:

• Click Sync on both branches.
• Go to the branch you want to merge into (the master in my case).
• In Team Explorer, under Branch Management, select Action → Open command prompt .
• At the command prompt, type git merge BRANCH_NAME . (my working branch / merge "from")
• The Conflict Resolution button is now available.

Answer 5

If conflicts during pulling are associated with end-of-line characters:

 git config --global core.autocrlf false 

This should avoid any automatic eol conversion.

You can see more in Why git believes that every line of an untouched file has changed, "how to detect this situation in a working tree ( git diff --word-diff-regex=. ).