title: Resolved git merge conflict in VS Code, but still says unresolved
body: <p>So I have a develop branch and topic branch. I'm using the default Terminal in Window's VS Code. While in the topic branch, I did <code>git merge develop</code> since I just got latest on develop branch. Now there's a simple merge conflict in one file. In VS Code, I resolved the conflict. On the code page, there's no more conflicts that you can <code>Accept Incoming</code> or <code>Accept Current</code>, but when I try to stage the file on the Source Control panel on the left, it shows a warning popup saying <code>Are you sure you want to stage with merge conflicts?</code></p>
  
  <p>Is this normal? it seems like VS Code doesn't think I resolved the conflict even tho I just did, and there's no more conflict in the file. Or is there something I'm missing Git/VS Code-wise?</p>