On Mon, Feb 28 2022, Rolf Eike Beer wrote:

[[PGP Signed Part:Undecided]]
Hi,

I usually sign my commits and merges. But when a merge has collisions I can't 
continue and sign in one step, because --continue and -S seem to be mutually 
exclusive. My way out is:

git merge --continue
git commit --amend --no-edit -S

... but this could be a bit simpler. Or maybe --continue could remember if I 
have passed "-S" to the original "git merge" command.

Regards,

You can just drop the use of "merge --continue" entirely and use
"commit" instead.

Caveats related to this were recently discussed on-list:
https://lore.kernel.org/git/CALRdAfcyfesNqfLhhe2GW_5V9s2hf++i6mZS1Lw5hqQYTca85w@mail.gmail.com/ (local)

As noted there I think this makes for confusing UI, but you should able to just:

    git commit -S