We have a monorepo with multiple websites and applications, we also use azure DevOps. Our commit messages are formatted like this: {website/application} - {feature} - {brief description} - {#work item} so e.g. "Auth - MFA - auto focus login field #162589"

The most beneficial part is the work item number, being able to link the code changes directly to the business logic is huge.

Also beneficial for bug fixes, push the commit with the bug id and the code changes are linked on the ticket automatically.

If I'm gonna merge some shit that'll probably have a bunch of conflicts, I'll create a throwaway "test-merge" branch because I'll inevitably fuck up the merge and even though I've used git for years I have no idea how to revert a merge andatthispointimafraidtoask.jpg