Stuck at "A merge operation in progress" : <h3>Steps</h3>

<ul>
<li>In Visual Studio</li>
<li>Pulled from remote repo</li>
<li>1 merge conflict.</li>
<li>Merged manually, clicked 'Accept merge'</li>
</ul>

<h3>Result</h3>

<ul>
<li>Message: "A merge operation is in progress in the ... repository. Commit your changes to complete the merge operation."</li>
<li>However, there is nothing to commit: There are 0 pending changes, no actions apart from Abort seem to be possible.</li>
</ul>

<p>Screenshot: <a href="https://pbs.twimg.com/media/DBOeRIiXsAEbnLP.jpg" rel="noreferrer">https://pbs.twimg.com/media/DBOeRIiXsAEbnLP.jpg</a></p>

<h3>Context</h3>

<ul>
<li>remote git repo is hosted in Visual Studio Team Services</li>
<li>Visual Studio 2017 with all updates</li>
</ul>
