27 ms·
> 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 aut
by yencabulator 5y ago
> 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.