Merge conflict markup not showing in marked file when attempting to merge branches using Git #297220
Description
Type: Bug
In a new folder, initialized empty git repository.
Created a README.md with "test" in line 1.
Add and commit.
Change default git branch name to "main".
Create new branch "featureA" - checkout and add a sentence in line 2
Add and commit featureA changes
Checkout main
Create new branch "featureB"
Add a conflicting text in line 2 and also add text in line 3
Add and commit featureB changes
Merge featureA into featureB
A merge conflict is detected
Expected result:
README.md is marked as having conflicting changes and there is a markup in the editor showing the conflicts.
Actual result:
README.md is marked as having conflicts, but still only shows what is in the currently checked out branch.
VS Code version: Code 1.109.4 (c3a2684, 2026-02-16T15:35:57.932Z)
OS version: Windows_NT x64 10.0.26200
Modes:
System Info
| Item | Value |
|---|---|
| CPUs | Intel(R) Core(TM) i9-14900HX (32 x 2419) |
| GPU Status | 2d_canvas: enabled GPU0: VENDOR= 0x8086, DEVICE=0xa788 [Intel(R) UHD Graphics], DRIVER_VENDOR=Intel, DRIVER_VERSION=32.0.101.6790 ACTIVE GPU1: VENDOR= 0x10de, DEVICE=0x2860 [NVIDIA GeForce RTX 4070 Laptop GPU], DRIVER_VERSION=32.0.15.8157 GPU2: VENDOR= 0x1414, DEVICE=0x008c [Microsoft Basic Render Driver], DRIVER_VERSION=10.0.26100.7309 Machine model name: Machine model version: 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_graphite: disabled_off trees_in_viz: disabled_off video_decode: enabled video_encode: enabled webgl: enabled webgl2: enabled webgpu: enabled webnn: disabled_off |
| Load (avg) | undefined |
| Memory (System) | 31.71GB (15.67GB free) |
| Process Argv | --crash-reporter-id 47062e72-b286-4fc0-8c34-5e41a6d411cd |
| Screen Reader | no |
| VM | 0% |
Extensions (12)
| Extension | Author (truncated) | Version |
|---|---|---|
| html-preview-vscode | geo | 0.2.5 |
| rest-client | hum | 0.25.1 |
| vscode-html-format | moh | 0.1.6 |
| mongodb-vscode | mon | 1.14.6 |
| debugpy | ms- | 2025.18.0 |
| python | ms- | 2026.2.0 |
| vscode-pylance | ms- | 2026.1.1 |
| vscode-python-envs | ms- | 1.20.1 |
| remote-ssh | ms- | 0.122.0 |
| remote-ssh-edit | ms- | 0.87.0 |
| remote-explorer | ms- | 0.5.0 |
| vscode-css-peek | pra | 4.4.3 |
(1 theme extensions excluded)
A/B Experiments
vsliv368cf:30146710
vswsl492cf:30256860
binariesv615:30325510
nativeloc1:31344060
dwcopilot:31170013
dwoutputs:31242946
copilot_t_ci:31333650
e5gg6876:31282496
pythonrdcb7:31342333
6518g693:31463988
aj953862:31281341
6abeh943:31336334
envsactivate1:31464700
cloudbuttont:31379625
3efgi100_wstrepl:31403338
use-responses-api:31390855
defaultusage:31403421
je187915:31401254
ec5jj548:31422691
cp_cls_c_966_ss:31454199
4je02754:31463857
a5gib710:31434435
38bie571_auto:31426784
7a04d226_do_not_restore_last_panel_session:31438103
cp_cls_t_1081:31454832
core-renderer-profiling-on:31440367
a43f0574:31442827
e9c30283:31461165
idci7584:31464702
edit_mode_hidden:31461530
nostats:31457175
864ei723_large_tool_results_to_disk:31460878
1jcgc265:31466512
chat:31457767