Merge conflict warning when there are none #44106
(5) Is unexpected.
I've also checked that the files do not contain any
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)
The text was updated successfully, but these errors were encountered:
To easily reproduce step 1 (tested on linux):
For (2), resolve the merge conflicts so that
I'm looking into this issue: here's what I found so far.
The code that displays the error is in
I tested using the repro from the first comment above, and after executing,
I'm guessing that the fix would involve checking if files with Status.BOTH_ADDED also had their conflicts resolved.
The existing code only checked for conflict markers for files with BOTH_MODIFIED status; files with BOTH_ADDED status were always detected as conflicting even after conflicts are resolved. This fixes microsoft#44106.
The original issue is different than the issue that the rest of the discussion talks about and the PR fixes. I pushed a fix for the original issue and will review the PR.
Original issue repro steps: have a conflict, resolve it and try to run
Other issue repro steps: #44106 (comment)