First one, imperative present tense. Good commit messages should be able to be preceded by the phrase “if applied, this commit will…”
https://cbea.ms/git-commit/amp/#imperative
I don't think that's true. I interpret this post as how a PR can be responded to. You either comment telling original to fix the merge conflicts, or you fix them yourself.
Your interpretation missed the part where the title of the post says it’s about commit messages. All of them are from the perspective of the person who thinks that they’ve fixed the problem (or equivalently, that the commit fixes the problem).
"Stupid #%!@& intern broke the repo again"
who gave the intern the ability to do that?
The ... uhm ... the office dog? \^\^'
In this situation, it is not the intern who is stupid, it is the senior who doesn't know how to set up the branch protection rules
Or the management that is too cheap to buy GitHub enterprise...
Aren't branch protection rules enabled even on free plan?
Not for private repos I think
Hm my mistake then
First one, imperative present tense. Good commit messages should be able to be preceded by the phrase “if applied, this commit will…” https://cbea.ms/git-commit/amp/#imperative
Great now I have to write “Break random shit no one saw coming”
I'm not sure in what tense "small changes" is.
Small changed
The plural of "small change" is "small changes". The past tense of "small change" is "oops I broke it again".
And the future tense is "I'll rewrite this mess from scratch"?
"Fiks" because if I use the word "fix" in any way in a commit with an AB# it automatically plops my ticket into closed and shoots over QA
Try `Fіx` (Note: This is not a standard `i`, hex of the text is `46 D1 96 78`)
default git merge message
This for sure. After doing the merge you don’t even need to type the message, just “git commit” and the default merge message is used.
Iirc the jetbrains GUI requires a message
Well there's your problem!
Case ########: Fix merge conflict Fixed merge conflict.
This is the way.
Attempt to fix… Possible solution for…
I dno about you nerds but all my commit messages are ‘wip’
If you're feeling tense about your commits, you haven't done enough testing :)
This one for sure fixes the merge conflict this time. Unlike the last 6 commits...
"Merges conflicted fixes"
Thus unto thee m'lord branch this merge conflicts hath been fixeth
The correct one is not even there Fixes merge conflict
Present third person is cursed
I think that is implied by the right side.
All of them are implicit in each other. The question is how you want to phrase it
I don't think that's true. I interpret this post as how a PR can be responded to. You either comment telling original to fix the merge conflicts, or you fix them yourself.
Your interpretation missed the part where the title of the post says it’s about commit messages. All of them are from the perspective of the person who thinks that they’ve fixed the problem (or equivalently, that the commit fixes the problem).
You are right, I missed that, thank you!
Red
Never celebrate early. It is not really fixed if it is not working in prod.
Fixing merge conflict
Team Give up, Delete local repo, try again
Merge conflict fix
Hopeful, future tense. "This will fix merge conflict." Like I'm willing it into existence.
WIP WIP WIP WIP WIP WIP
This is the Indiana Jones of commit messages.
Todo: fix <...> Commit message: fixed <...>
Fix conflict: foo bar... of course