Conflict view is not working

[biniljohn7]

Type: Bug

Conflict view is not working

https://drive.google.com/file/d/1M6-uvpE1KtI5_D1ey3bnuWJFYQP1c9l0/view?usp=sharing

VS Code version: Code 1.70.1 (6d9b74a, 2022-08-10T06:08:33.642Z)
OS version: Windows_NT x64 6.3.9600
Modes:

System Info

Item	Value
CPUs	Intel(R) Core(TM) i3-4130 CPU @ 3.40GHz (4 x 3392)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: disabled_off direct_rendering_display_compositor: disabled_off_ok gpu_compositing: enabled multiple_raster_threads: enabled_on opengl: enabled_on rasterization: enabled raw_draw: disabled_off_ok skia_renderer: enabled_on video_decode: unavailable_off video_encode: unavailable_off vulkan: disabled_off webgl: enabled webgl2: enabled
Load (avg)	undefined
Memory (System)	7.90GB (1.40GB free)
Process Argv	--crash-reporter-id 223965dd-a979-4134-b6ae-a64a47b0cd29
Screen Reader	no
VM	0%

Extensions (10)

Extension	Author (truncated)	Version
vscode-intelephense-client	bme	1.8.2
es7-react-js-snippets	dsz	4.4.3
vscode-html-css	ecm	1.13.1
vscode-favorites	how	1.10.2
vs-deploy	mkl	14.0.0
azure-account	ms-	0.11.1
prettier-vscode-with-tabs	pas	1.1.0
funclist	qrt	7.6.3
vscode-icons	vsc	11.15.0
material-theme	zhu	3.15.2

(2 theme extensions excluded)

A/B Experiments

vsliv368:30146709
vsreu685:30147344
python383cf:30185419
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
pythonvspyl392:30443607
vserr242:30382549
pythontb:30283811
vsjup518:30340749
pythonptprofiler:30281270
vsdfh931cf:30280410
vshan820:30294714
vstes263:30335439
pythondataviewer:30285071
vscod805cf:30301675
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
cmake_vspar411cf:30542925
vsaa593cf:30376535
pythonvs932:30410667
wslgetstarted:30449410
cppdebug:30492333
pylanb8912:30545647
vsclangdc:30486549
c4g48928:30535728
hb751961:30543456
dsvsc012:30540252
azure-dev_surveyone:30548225

[abhijit-chikane]

I also notice the same issue
with the new merge editor it is not working
Accept all current changes and
Accept all remote changes these options also does not work

[Axel-Coud]

Same problem here, conflict view/highlighter is not showing up anymore (no config change whatsoever)

[metal571]

Also not working here in the case of Subversion conflicts. These conflicts were correctly detected and highlighted up until 1.70 when they broke. Neither 1.70.1 nor 1.70.2 recovery releases have fixed this.

[hediet]

/duplicate

Most of the old experience will be restored in the next update.

[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!

[abhijit-chikane]

But it's not about the old
Its happening with the new merge ui as well