Visual Studio 2013 does not offer to do merge on Git pull

Question

I\'m working with Visual Studio 2013 Update 4 and git (hosted on Visual Studio Online). I have 2 local commits and 2 commits in remote branch. There are NO local changes to

Answer 1

I have encountered the same issue where "An error occurred. Detailed message: 1 conflict prevents checkout" is shown where there's no option to resolve the conflict as shown in Leinel's answer.

The reason was due to an untracked file that is the same file that is to be pulled. I just deleted the untracked file and retried the pull.