3-way Merge Editor does not work properly

[SpiraMira]

Type: Bug

I am merging one branch into another.
It looks like the 3-way merge editor does not function properly anymore. When activating the merge editor on a conflicted file :

• result window is almost always empty or has a weird snippet of code
• all merge conflicts resolve to a single conflict
• the neat new merge controls are no longer there - instead I get the old-style accept Incoming/Current etc...
• when switching to normal mode (old-style classic) - the conflict markers are inserted correctly
• ran this again with disable-extensions and same results
• a 3rd party merge resolver/editor like Kaleidoscope (app + extension) works properly
• this broke about a few versions of vs-code ago

VS Code version: Code 1.74.0 (5235c6b, 2022-12-05T16:37:54.581Z)
OS version: Darwin arm64 21.6.0
Modes:
Sandboxed: No

System Info

Item	Value
CPUs	Apple M1 Pro (10 x 24)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: disabled_off direct_rendering_display_compositor: disabled_off_ok gpu_compositing: enabled metal: disabled_off multiple_raster_threads: enabled_on opengl: enabled_on rasterization: enabled raw_draw: disabled_off_ok skia_renderer: enabled_on video_decode: enabled video_encode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled webgpu: disabled_off
Load (avg)	9, 8, 7
Memory (System)	32.00GB (0.22GB free)
Process Argv	--crash-reporter-id c3c34edc-0e01-4b9f-8471-1a650841a295
Screen Reader	no
VM	0%

Extensions: none

A/B Experiments

vsliv368cf:30146710
vsreu685:30147344
python383:30185418
vspor879:30202332
vspor708:30202333
vspor363:30204092
vstes627:30244334
vslsvsres303:30308271
pythonvspyl392:30443607
vserr242:30382549
pythontb:30283811
vsjup518:30340749
pythonptprofiler:30281270
vshan820:30294714
vstes263cf:30335440
vscorecescf:30445987
pythondataviewer:30285071
vscod805cf:30301675
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
cmake_vspar411:30581797
vsaa593cf:30376535
pythonvs932:30410667
cppdebug:30492333
vsclangdc:30486549
c4g48928:30535728
dsvsc012:30540252
azure-dev_surveyone:30548225
pyindex848cf:30577861
nodejswelcome1:30587005
2e4cg342:30602488
3d0df643:30613357
f6dab269:30613381
fim-prod:30623723
vscsbc:30628655

[vscodenpa]

Thanks for creating this issue! It looks like you may be using an old version of VS Code, the latest stable release is 1.74.2. Please try upgrading to the latest version and checking whether this issue remains.

Happy Coding!

[SpiraMira]

Just did and same behavior: About Visual Studio Code is below ...

Version: 1.74.2
Commit: e8a3071
Date: 2022-12-20T10:32:21.587Z
Electron: 19.1.8
Chromium: 102.0.5005.167
Node.js: 16.14.2
V8: 10.2.154.15-electron.0
OS: Darwin arm64 21.6.0
Sandboxed: No

I have attached a first set of screenshots of a rather simple merge (.csproj update from net 6 to net 7). I have merge editor turned off in settings so the first screenshot is the conflicted file in classic mode. The second screenshot is after I activate "Resolve in Merge Editor" ...

This set of screenshots occurs while merging an npm package.json files (with multiple conflicts!)
You can see that "Resolve in Merge Editor" identifies only one (massive) conflict instead ... results window is also weird and empty...

[hediet]

/duplicate #157496

[vscodenpa]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.

Happy Coding!