#0: Permit merges and --fixup

[afuller-TT]

Ticket

None

Problem description

Local dev is hampered by not being able to git merge or git commit --fixup without also building --no-verify into muscle memory (which is not a good muscle memory to develop).

What's changed

Permit automatic commit messages for merge and fixup commits.

Checklist

• Post commit CI passes
• Blackhole Post commit (if applicable)
• Model regression CI testing passes (if applicable)
• Device performance regression CI testing passes (if applicable)
• New/Existing tests provide coverage for changes