Git extension: rebase -i skips commit message prompt

[LuxDie]

Type: Bug

I use VSCode to rebase my Git branches by running the console command git rebase -i... then using the visual interface to fix conflicts and edit messages. I've found that when a rebase has merge conflicts and you use the Git extension to "Continue" (blue action button) and your rebase had squash commands, Git will skip prompting for a commit message and will use the default message merging of all squashed messages. This problem doesn't happen when using git rebase --continue from the console.

Steps to reproduce

1. Init a Git repository
2. Make 5 commits and make sure to create merge conflicts.
3. Run git rebase -i HEAD~4 in the console.
4. Swap the 1º and 2º commits, then make the 4º "squash".
5. Fix merge conflicts through VSCode, clicking "Continue" once conflicts are resolved.

Expected behavior

VSCode will open an editor with the commit message file for the squash operation.

Actual behavior

Git will finish the rebase using a merge of the commit messages and giving no prompt to edit the message.

Also note that when there are no merge conflicts, the message editor opens normally.

Thank you.

VS Code version: Code 1.100.3 (258e40f, 2025-06-02T13:30:54.273Z)
OS version: Linux x64 6.11.0-26-generic snap
Modes:

System Info

Item	Value
CPUs	Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (4 x 2699)
GPU Status	2d_canvas: unavailable_software canvas_oop_rasterization: disabled_off 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 video_decode: disabled_software video_encode: disabled_software vulkan: disabled_off webgl: unavailable_software webgl2: unavailable_software webgpu: disabled_off webnn: unavailable_software
Load (avg)	2, 3, 3
Memory (System)	7.61GB (1.94GB free)
Process Argv	--no-sandbox --force-user-env --crash-reporter-id 142699bf-6637-4271-a1b1-addef6d923fc
Screen Reader	no
VM	0%
DESKTOP_SESSION	ubuntu-xorg
XDG_CURRENT_DESKTOP	Unity
XDG_SESSION_DESKTOP	ubuntu-xorg
XDG_SESSION_TYPE	x11

Extensions (11)

Extension	Author (truncated)	Version
ng-template	Ang	20.0.1
atlascode	atl	3.8.3
figma-vscode-extension	fig	0.4.1
copilot	Git	1.331.0
copilot-chat	Git	0.27.3
todo-tree	Gru	0.0.226
vscode-test-explorer	hbe	2.22.1
karma-test-explorer	luc	0.8.2
vscode-language-pack-es	MS-	1.100.2025051409
test-adapter-converter	ms-	0.2.1
vscode-yaml	red	1.18.0

A/B Experiments

vsliv368cf:30146710
vspor879:30202332
vspor708:30202333
vspor363:30204092
vscod805cf:30301675
binariesv615:30325510
c4g48928:30535728
azure-dev_surveyone:30548225
962ge761:30959799
h48ei257:31000450
pythontbext0:30879054
cppperfnew:31000557
dwnewjupytercf:31046870
pythonrstrctxt:31112756
nativeloc2:31192216
5fd0e150:31155592
dwcopilot:31170013
6074i472:31201624
dwoutputs:31242946
customenabled:31248079
9064b325:31222308
copilot_t_ci:31222730
e5gg6876:31282496
pythoneinst12:31285622
bgtreat:31268568
4gafe986:31271826
c7cif404:31314491
996jf627:31283433
pythonrdcb7:31303018
usemplatestapi:31297334
0aa6g176:31307128
7bj51361:31289155
747dc170:31275177
6518g693:31319473
pylancecolor:31314202
aj953862:31281341
generatesymbolt:31295002
convertfstringf:31295003
gendocf:31295004