Merge editor reports 3 conflicts when only 1 is visible

[bpasero]

The next/previous commands also do not work:

merge.json.txt

[bpasero]

This conflict was interesting because GH could not show it even on their web UI. Part of the change on main was that the file was renamed (from window.ts to windowImpl.ts). It happened when I merged main into https://github.com/microsoft/vscode/tree/sbatten/brave-lamprey

I manually looked at the file and only saw 1 merge marker from git (<<<<<<<).

[hediet]

This fixes it:

"mergeEditor.diffAlgorithm": "experimental",

[connor4312]

I've set "mergeEditor.diffAlgorithm": "experimental", but still see "3 Conflicts Remaining" on today's Insiders. Are there additional steps?

[hediet]

With conflict markers, this is the actual result:

conflict.json.txt

[bpasero]

@hediet when I use the command to load the JSON file via https://github.com/microsoft/vscode/files/9429001/conflict.json.txt, I get this:

[connor4312]

The JSON blob works for me