ebrannin-bw
commented
1 year ago The same request applies to a merge commit after resolving conflicts.
As a workaround, whenever this happens I do the commit by running git commit and accepting the generated message.
When doing a rebase, after resolving any merge conflicts I am prompted to enter a commit message. The expected behavior is to populate the commit message per the commit that is being rebased.