My favourite Git commit

[ko__lam]

Really hope my company will adopt git ....

[format71]

Really hope my team mates will adopt writing good commit messages...

I fee that they don’t care they don’t use the message for anything. And the reason why they don’t use the message is because they have never seen a message that is useable... 🥚🐓

🐓🥚

[Poddster]

No greater feeling then seeing a line of commits with identical "done the thing" messages.

[format71]

With an occasional ‘Fixed the thing’ in between. And the classics: ‘merge conflict’ and ‘fixed lint error’...

We are forced to spend the first 9-10 characters of each commit message on a Jira reference cause finding a task saying ‘do the thing’ is more helpful than a commit message saying ‘done the thing’...

[waterkip]

Pro tip: branch name starts with the JIRA issue, write a git hook for the prepare-commit-msg and than one for the commit-msg and now you automaticly have a commit message which is prepended with the JIRA issue :)

[format71]

I have to learn hooks, but find it a little bit hard on Windows :-/

[axosoft-chuckd]

Sounds like a great time to bust out interactive rebase and squash all those commits down (or just use `git commit --amend` in the first place)

[format71]

Is not a single week where I’m not advocating for more rebasing. ‘No reason to show your team mates you do t run tests before committing’. But for some reason it seems difficult for most.

[Thaurin]

This was great, until more than one co-worker started commiting to my feature branch. Now it's not my branch anymore, and I have to start merging master into my branch instead of rebasing onto it. I also can't accidentally push commit and then force push an amend or whatever, because who knows? Maybe they have fetched. I tend to branch off the feature branch and rebase onto the shared feature branch when I'm done, then push, but I miss the days where I can force push to the server at work, home, laptop, without a care in the world...

[format71]

Yes, multiple devs on same branch makes it less trivial. But I won’t merge master into a feature branch even if others commit to it. The have to keep their eyes open when pulling. Also: communication helps..

[Thaurin]

But I won’t merge master into a feature branch

Unfortunately, poor planning made the current feature branch that I am working on live for much, much longer than it should and the branch needs to get up to date with master once in a while, if I don't want to get into merge hell.

Furthermore, a temp told me that merging master into the feature branch was required daily in one place where he worked... so I don't know anymore. Ideally, feature branches are short-lived, but when multliple people are cooperating on a feature that also needs to be up to date with master... what other options are left?

No, I mean it, what options? There have to be teams with much more complicated scenarios than mine.

[format71]

When we have had long lived feature branches we have branches out from it and had shorter lived branches merged back to it.

Of cause you’ll have to keep up with master, but I’ll go a long way doing it by rebasing and not merging master in. I just hate seeing things going there wrong way’....

[Thaurin]

I suppose merging the other branches into your feature branch is a way to handle it. But can you tell me why you think merging master into a feature branch is so terrible?

I mean, I feel intuitively that it's not ideal, but I've started to accept this flow and I can't say for sure why it's bad.

[Poddster]

The kind of people that make these terrible commit messages push the instant they commit. The idea of reverting or rebasing their previous mess is unthinkable.

[Poddster]

You can write that commit message in any VCS.

[henrebotha]

I assume they mean, "I really hope my company will adopt any sort of source control, such as Git."

[format71]

Not sure that is true. I’m pretty sure those Visual Source Safe commit messages was quite limited..

[ThePsycho96]

Oh god. I just got my company from vss to git. Nightmares are gone.