Re:How to write a Git commit message (2014)
by yencabulator on Monday May 02, 2022 @02:08PM
(#31238626)
> chore: resolve a merge conflict
This should never be a standalone commit! A merge conflict is solved by the merge commit, and if you were to override the automatic commit message, this seems like a very information-poor text to replace it with.
chore: resolve a merge conflict
chore: fix code formatting
chore: update dependency type definitions library
Each of these things is nice to have tracked as their own commit so they don’t show up in other more impactful or isolated commits. They don’t add a lot to the code but are rather little house keeping actions that help keep a codebase clean and up to date.