Updated to 2.1.10.0 yesterday, merged a lot of changes from stable to my feature branch today, had a couple of conflicts.

Tried to resolve the conflicts with my external merge tool (P4Merge). Edited the conflicts in P4Merge, saved the changes, closed P4Merge. -> Some of the conflicted files were removed from the conflict list, but most were not. I had to manually git add them.

Some of the files had a double extension, like *.vcxproj.filter, but others were just ordinary *.cpp or *.h files.

In addition, I had a couple of files which I deleted on my branch, but which were changed on the remote branch. Wasn't able to resolve the conflict by clicking "use mine", had to manually git rm them.