Issue Type

Bug

Description

1. Rebase a Git branch on to another containing identical changes (but without the abiltiy for git to fast-forward).
2. Use VS code to resolve the conflicts so that a file no longer contains any diffs.
3. Observe that there are no conflict markers remaining in the file.
4. Attempt to stage the file.
5. Observe the Are you sure you want to stage XXX with merge conflicts? message.
6. Click ok.
7. Observe the file disappears from the source control list (as expected due to the no-delta change).

(5) Is unexpected.

I've also checked that the files do not contain any <<<, ===, >>> looking comments.

This happens more often than not, but I have seen it stage the file without warning before. I was unable to determine what was different with this situation.

Observed on Linux, macOS and Windows.

VS Code Info

VS Code version: Code 1.20.1 (f88bbf9, 2018-02-13T15:31:21.019Z)
OS version: Linux x64 4.13.0-32-generic

System Info

Item	Value
CPUs	Intel(R) Core(TM) i7-4930K CPU @ 3.40GHz (12 x 3400)
Load (avg)	1, 2, 1
Memory (System)	15.60GB (9.40GB free)
Process Argv	/usr/share/code/code --disable-extensions
Screen Reader	no
VM	0%

Extensions disabled Reproduces without extensions