Well, I had the similar issue. I had taken latest but there were some changes in the local due to which the merge was not happening to a particular file. The file was untracked and I did not want them so What I did was -
$ git checkout filepath/filename
filepath - The location from where I did the git bash. then when I took the latest the changes were available