Can't use default commit message when merge conflicts

[BMBurstein]

Issue Type: Bug

When doing a git merge <branch>, if there are merge conflicts, the merge is paused until the conflicts are resolved. In VSCode, any conflicting files appear in the source control as conflicted. After I resolve them and stage them, I want to finish the merge. If I commit from the command line (git commit) I am presented with a default commit message (something like "Merge branch X into branch Y"). However, if I finish the merge commit from VSCode (by clicking the commit button), I am prompted for a commit message with an epmty box.

VS Code version: Code 1.51.0 (fcac248, 2020-11-05T18:18:23.642Z)
OS version: Windows_NT x64 10.0.18363
Remote OS version: Linux x64 4.9.0-0.bpo.6-amd64
Remote OS version: Linux x64 5.9.3-arch1-1

System Info

Item	Value
CPUs	Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz (8 x 1896)
GPU Status	2d_canvas: enabled flash_3d: enabled flash_stage3d: enabled flash_stage3d_baseline: enabled gpu_compositing: enabled multiple_raster_threads: enabled_on oop_rasterization: disabled_off opengl: enabled_on protected_video_decode: enabled rasterization: enabled skia_renderer: disabled_off_ok video_decode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled
Load (avg)	undefined
Memory (System)	15.85GB (5.44GB free)
Process Argv	--crash-reporter-id 6949b6e9-d952-4b8f-a136-284374926c80
Screen Reader	no
VM	0%

Item	Value
Remote	SSH: mews7748
OS	Linux x64 4.9.0-0.bpo.6-amd64
CPUs	Intel(R) Core(TM) i7-7700 CPU @ 3.60GHz (8 x 4026)
Memory (System)	15.54GB (0.56GB free)
VM	0%

Item	Value
Remote	SSH: 127.0.0.1
OS	Linux x64 5.9.3-arch1-1
CPUs	Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz (1 x 1895)
Memory (System)	1.94GB (1.04GB free)
VM	100%

Extensions (11)

Extension	Author (truncated)	Version
bracket-pair-colorizer-2	Coe	0.2.0
remote-ssh	ms-	0.55.0
remote-ssh-edit	ms-	0.55.0
material-icon-theme	PKi	4.4.0
gitlens	eam	10.2.3
todo-tree	Gru	0.0.187
me-vscode	ME-	0.0.9
git-graph	mhu	1.27.0
python	ms-	2020.10.332292344
cpptools	ms-	1.1.1
hexeditor	ms-	1.3.0

[joaomoreno]

This is already implemented. When the merge conflict happens, the input box should show Git's default message:

[BMBurstein]

@joaomoreno This is not what I am seeing. How did you record it? I will record it to show you.

[joaomoreno]

You can use gifcap?

[BMBurstein]

I don't know what I did before to cause this, but I am unable to reproduce it again. Thank you anyway!