Using merge editor for requirements.txt files

[TrevorBenson]

Type: Bug

1. Rebase a branch which has conflicts in a requriements.txt style file.
2. Select resolve in merge editor
3. Observe that the merged editor buttons are offering to "Create Environment", not resolve the merge conflict.

VS Code version: Code 1.78.2 (b3e4e68a0bc097f0ae7907b217c1119af9e03435, 2023-05-10T14:47:05.613Z)
OS version: Linux x64 6.2.9-200.fc37.x86_64
Modes:
Sandboxed: Yes

System Info

Item	Value
CPUs	Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz (12 x 4000)
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 video_decode: enabled video_encode: disabled_software vulkan: disabled_off webgl: enabled webgl2: enabled webgpu: disabled_off
Load (avg)	1, 1, 1
Memory (System)	30.98GB (8.53GB free)
Process Argv	--unity-launch --crash-reporter-id 580bece0-b191-4d8a-b8bf-253607cede2d
Screen Reader	no
VM	0%
DESKTOP_SESSION	gnome
XDG_CURRENT_DESKTOP	GNOME
XDG_SESSION_DESKTOP	gnome
XDG_SESSION_TYPE	x11

Extensions (43)

Extension	Author (truncated)	Version
better-comments	aar	3.0.2
markdown-mermaid	bie	1.18.1
git-diff-and-merge-tool	dav	1.0.5
gitlens	eam	13.6.0
hadolint	exi	1.1.2
codespaces	Git	1.14.7
copilot-labs	Git	0.14.884
copilot-nightly	Git	1.88.144
vscode-github-actions	git	0.25.7
vscode-pull-request-github	Git	0.64.0
haskell	has	2.2.4
language-haskell	jus	3.6.0
saltstack	kor	0.0.9
git-graph	mhu	1.30.0
vscode-docker	ms-	1.25.1
vscode-kubernetes-tools	ms-	1.3.11
black-formatter	ms-	2023.2.0
flake8	ms-	2023.4.0
pylint	ms-	2023.4.0
python	ms-	2023.8.0
vscode-pylance	ms-	2023.5.50
jupyter	ms-	2023.4.1011241018
jupyter-keymap	ms-	1.1.0
jupyter-renderers	ms-	1.0.15
vscode-jupyter-cell-tags	ms-	0.1.8
vscode-jupyter-slideshow	ms-	0.1.5
remote-containers	ms-	0.292.0
remote-ssh	ms-	0.102.0
remote-ssh-edit	ms-	0.86.0
remote-wsl	ms-	0.78.9
vscode-remote-extensionpack	ms-	0.24.0
remote-explorer	ms-	0.4.0
remote-server	ms-	1.1.0
ansible	red	2.2.69
vscode-openshift-connector	red	1.4.0
vscode-redhat-account	red	0.1.0
vscode-yaml	red	1.13.0
sourcery	sou	1.3.0
rst-vscode	tht	3.0.1
shellcheck	tim	0.32.6
io	tru	3.4.3
gitblame	wad	10.2.0
vscode-wakatime	Wak	24.0.11

A/B Experiments

vsliv368cf:30146710
vsreu685:30147344
python383:30185418
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
vserr242:30382549
pythontb:30283811
vsjup518:30340749
pythonptprofiler:30281270
vshan820:30294714
vstes263:30335439
vscod805cf:30301675
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
cmake_vspar411:30581797
vsaa593cf:30376535
pythonvs932:30410667
cppdebug:30492333
vsclangdf:30486550
c4g48928:30535728
dsvsc012:30540252
pynewext54:30695312
azure-dev_surveyone:30548225
vsccc:30610678
2e4cg342:30602488
pyind779:30671433
89544117:30613380
pythonsymbol12:30671437
2i9eh265:30646982
showlangstatbar:30737416
vsctsb:30748421
pythonms35:30701012
03d35959:30757346
pythonfmttext:30731395
pythoncmvfstrcf:30756944
fixshowwlkth:30730052
hidesbindicator:30760978
pythongtdpath:30739704
pythonnosmt12:30757131

[hediet]

Seems like microsoft/vscode#179306 is not fully fixed.

[karthiknadig]

Henning Dieterichs (@hediet) Is !inDiffEditor context key in when clause enough to skip showing it in those cases? or do we need a different key?

[hediet]

Most likely you need !isMergeResultEditor