No Merge Commits

Something you may have noticed when resolving merge conflicts is that you don't get the "standard" merge commit message:

Merge branch 'main' into add_customers

You have to manually provide a message. Guh. Typing. It actually makes sense when you think about it: Git doesn't know what you did to resolve the conflict, and it's encouraging you to document your changes via a custom commit message.