Resolve in Merge Editor doesn't work

[azeunkn0wn]

Type: Bug

• get a merge conflict
• resolve in merge editor
• Merge editor error: The editor could not be opened because the file was not found.

VS Code version: Code 1.98.1 (2fc07b8, 2025-03-10T15:38:08.854Z)
OS version: Windows_NT x64 10.0.26100
Modes:

System Info

Item	Value
CPUs	AMD Ryzen 7 5800X3D 8-Core Processor (16 x 3400)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: enabled_on 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 video_decode: enabled video_encode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled webgpu: enabled webnn: disabled_off
Load (avg)	undefined
Memory (System)	47.91GB (30.60GB free)
Process Argv	--crash-reporter-id 2367be45-51a3-4604-964c-e16295c64063
Screen Reader	no
VM	0%

Extensions (82)

Extension	Author (truncated)	Version
adb-qr	Aak	0.2.0
better-comments	aar	3.0.2
vscode-base64	ada	0.1.0
TabOut	alb	0.2.2
vscode-sqlite	ale	0.14.1
flutter-snippets	ale	3.0.0
jsoncrack-vscode	Ayk	3.0.0
jump-to-test	bla	0.0.4
gitignore	cod	0.10.0
dart-code	Dar	3.106.0
flutter	Dar	3.106.0
vscode-markdownlint	Dav	0.59.0
vscode-eslint	dba	3.0.10
vscode-new-file	dku	4.0.2
githistory	don	0.6.20
gitlens	eam	16.3.2
prettier-vscode	esb	11.0.0
vscode-flutter-riverpod-helper	evi	0.1.10
bloc	Fel	6.7.0
file-icons	fil	1.1.0
auto-close-tag	for	0.5.15
code-runner	for	0.12.2
kotlin	fwc	0.2.36
copilot	Git	1.282.0
copilot-chat	Git	0.25.0
arb-editor	Goo	0.2.1
publink	gor	0.1.3
todo-tree	Gru	0.0.226
vscode-test-explorer	hbe	2.22.1
debug-visualizer	hed	2.4.0
rest-client	hum	0.25.1
pubspec-assist	jer	2.3.2
firebase-explorer	jsa	0.3.3
calculator	lix	0.1.1
inifmt	lkr	0.1.7
flutter-intl	loc	1.19.3
l10nization	lsa	3.3.1
dart-import	lua	0.3.1
syntax-project-pbxproj	mar	0.1.3
csharp	ms-	2.63.32
vscode-dotnet-runtime	ms-	2.2.8
debugpy	ms-	2025.5.2025031001
python	ms-	2025.3.2025031001
vscode-pylance	ms-	2025.3.100
remote-containers	ms-	0.401.0
remote-ssh	ms-	0.118.0
remote-ssh-edit	ms-	0.87.0
vscode-remote-extensionpack	ms-	0.26.0
cpptools	ms-	1.23.6
cpptools-extension-pack	ms-	1.3.1
live-server	ms-	0.4.15
remote-explorer	ms-	0.4.3
remote-server	ms-	1.5.2
test-adapter-converter	ms-	0.2.1
vscode-speech	ms-	0.12.1
awesome-flutter-snippets	Nas	4.0.1
color-highlight	nau	2.8.0
trailing-semicolon	nau	1.0.2
indent-rainbow	ode	8.3.1
explorer-exclude	Pet	1.3.2
vscode-versionlens	pfl	1.16.2
material-icon-theme	PKi	5.20.0
material-product-icons	PKi	1.7.1
quicktype	qui	23.0.170
vscode-yaml	red	1.17.0
synthwave-vscode	Rob	0.1.18
flutter-riverpod-snippets	rob	1.2.2
multi-command	ryu	1.6.0
svg-preview	Sim	2.8.3
slowbug	sri	1.0.7
iconfont-preview	stx	0.0.5
vscode-todo-list	thi	1.0.4
vscode-fontawesome-gallery	tom	0.0.7
adb-interface-vscode	vin	0.22.4
intellicode-api-usage-examples	Vis	0.2.9
vscodeintellicode	Vis	1.3.2
vscode-icons	vsc	12.11.0
codetour	vsl	0.0.59
flutter-code-select	wan	1.1.1
flutter-assets-gen2	wee	0.1.8
cors-browser	Wsc	1.0.11
vscode-sqlite3-editor	yy0	1.0.204

(2 theme extensions excluded)

A/B Experiments

vsliv368cf:30146710
vspor879:30202332
vspor708:30202333
vspor363:30204092
vswsl492:30256859
vscod805cf:30301675
binariesv615:30325510
py29gd2263:31024239
c4g48928:30535728
azure-dev_surveyone:30548225
a9j8j154:30646983
962ge761:30959799
2e7ec940:31000449
pythontbext0:30879054
cppperfnew:31000557
dwnewjupyter:31046869
nativerepl1:31139838
pythonrstrctxt:31112756
nativeloc2:31192216
iacca1:31171482
5fd0e150:31155592
dwcopilot:31170013
6074i472:31201624
dwoutputs:31242946
customenabled:31248079
9064b325:31222308
copilot_t_ci:31222730
f5992895:31254866
jda6j935:31233686
4d2d8976:31256800
hb9j0513:31256344

[hediet]

Do you have steps to reproduce?

[heinrichmartin]

Not trying to hijack an issue, but to prevent duplicates; which my issue may or may not be.

I am working on a remote host. Local UI version 1.98.0 Windows.

Error message: "The editor could not be opened due to an unexpected error. Please consult the log for more details."

Log: "[warning] [GitFileSystemProvider][readFile] File not found - git:/path/to/file/?%7B%22path%22%3A%22%2Fpath%2Fto%2Ffile%22%2C%22ref%22%3A%22%3A1%22%7D"

My guess is that some component is trying to read a local file. How can I help debugging further?

[heinrichmartin]

My guess is that some component is trying to read a local file.

Disregard. My issue applies to local files, too. Merge Editor simply does not work when the file was added in both branches i.e. when it does not have a common ancestor (git show --textconv :1:<path> was in the logs, too; and that does not work in this case).

I cannot tell about the original case of this issue. Sorry for any distraction.

[vs-code-engineering]

Hey @hediet, this issue might need further attention.

@azeunkn0wn, you can help us out by closing this issue if the problem no longer exists, or adding more information.