Always show "Merge branch [...]" commit message (even when starting SourceGit after a merge via terminal)

[Hurricane31337]

Sometimes, when merging with SourceGit, the commit message is empty, even though it would fill it with "Merge branch [...]" if I left the message blank and committed it anyways. Maybe it is when starting/unminimizing SourceGit after a merge via terminal (and not "clicking" the merge in SourceGit).

Additionally, other Git GUIs like SourceTree append the files that were in conflict when merging:

For reference, here is it as copyable text:

Merge branch 'Update/Upd100'

# Conflicts:
#	toolproglokal.root/toolprog/Adressen-KD-Formen/Form_emaileditor.Designer.vb
#	toolproglokal.root/toolprog/Adressen-KD-Formen/Form_emaileditor.resx
#	toolproglokal.root/toolprog/Adressen-KD-Formen/Form_emaileditor.vb
#	toolproglokal.root/toolprog/Adressen-KD-Formen/form_bieterlv.vb
#	toolproglokal.root/toolprog/Adressen-KD-Formen/form_urlaub.Designer.vb
#	toolproglokal.root/toolprog/Adressen-KD-Formen/form_urlaubseinstell.vb
#	toolproglokal.root/toolprog/steuerelemente/cfo_fehlermelden.vb

Before switching from SourceTree to SourceGit with our whole company, it's essential for us that SourceGit shows the files in conflict while merging in the commit message. Without it we can't investigate potential wrong decisions.

Would it be therefore be possible to add this feature? 🙏

[love-linger]

SourceGit does not use -m <MSG> in git merge command. So git uses default Merge brach '<branch>' [into ...] as the commit message.

In fact, if the commit message's TextBox is empty before merging, SourceGit will try to read the <git_dir>/MERGE_MSG or <git_dir>/rebase-merge/message if there are some conflicts after merging/rebasing. But if user have input their commit message, SourceGit will not overwrite it.

Clipchamp.mp4

[love-linger]

I've pushed a new commit that clears the commit message before merging/cherry-picking/rebasing/reverting to allow SourceGit read the correct message from git

[Hurricane31337]

Okay thank you very much, I can't wait to check it out! 🤩