Stuck in "Performing a Merge Operation"

Question

Actions

• In visual studio
• Made from remote repo
• 1 merge conflict.
• Manually merged, click Accept Merge

Result

• Message: "The merge operation is in progress in the repository ... Complete the changes to complete the merge operation."
• However, there is nothing to do: there are 0 pending changes, no action other than Abort is possible.

Screenshot: https://pbs.twimg.com/media/DBOeRIiXsAEbnLP.jpg

Context

• remote git repo hosted in Visual Studio Team Services
• Visual Studio 2017 with all updates

Answer 1

, TFS Visual Studio 2017. git. , . , , , .

, , , VS 2015 , . , VS 2017 .

, , . , "" , "". , , AM .;)

Answer 2

pull Git Visual Studio , . , " ", . , .

, . , . , . - "". .