Open Merge Conflict Editor Disappears

[hanniavalera]

Type: Bug

Was going on with my usual workflow, in this case, the incoming changes were deleting the current file, and I opted to just take in the incoming changes from the right. The merge button did not show up despite me accepting the changes, and in addition, when I wanted to go back to merge, it did not show up.

VS Code version: Code 1.115.0 (53fb310, 2026-04-07T09:41:08Z)
OS version: Windows_NT x64 10.0.26100
Modes:

System Info

Item	Value
CPUs	AMD EPYC 7763 64-Core Processor (16 x 2445)
GPU Status	2d_canvas: unavailable_software GPU0: VENDOR= 0x1414, DEVICE=0x008c [Microsoft Basic Render Driver], DRIVER_VENDOR=Google, DRIVER_VERSION=10.0.26100.7309 GPU1: VENDOR= 0x1414, DEVICE=0x008c [Microsoft Basic Render Driver], DRIVER_VERSION=10.0.26100.7309 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: disabled_software multiple_raster_threads: enabled_on opengl: disabled_off rasterization: disabled_software raw_draw: disabled_off_ok skia_graphite: disabled_off trees_in_viz: disabled_off video_decode: disabled_software video_encode: disabled_software webgl: unavailable_software webgl2: unavailable_software webgpu: unavailable_software webnn: unavailable_software
Load (avg)	undefined
Memory (System)	63.95GB (36.00GB free)
Process Argv
Screen Reader	no
VM	0%

Extensions (21)

Extension	Author (truncated)	Version
cerebras-chat	Cer	0.1.20
vscode-eslint	dba	3.0.24
ms-devbox	Dev	2.2.0
prettier-vscode	esb	12.4.0
copilot-chat	Git	0.43.0
vscode-github-actions	git	0.31.3
vscode-containers	ms-	2.4.1
csdevkit	ms-	3.10.14
csharp	ms-	2.130.5
vscode-dotnet-runtime	ms-	3.0.0
vscodeintellicode-csharp	ms-	2.2.3
remote-containers	ms-	0.447.0
cmake-tools	ms-	1.23.44
cpp-devtools	ms-	0.5.2
cpptools	ms-	1.31.4
cpptools-extension-pack	ms-	1.5.1
makefile-tools	ms-	0.12.17
powershell	ms-	2025.4.0
remote-explorer	ms-	0.5.0
remote-server	ms-	1.5.3
vscode-yaml	red	1.21.0

(1 theme extensions excluded)

[vs-code-engineering]

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

Happy Coding!