Git - what's the consensus on best commit practice?

[Overspark]

Running a script after every pull is what you use hooks for normally. You only need to run it once manually to set up the hook locally, after that it's hooked in and can run every time. Of course you lose the promoting refactoring to skip running a script thing.

[halbarad]

Thanks for the suggestions, I'm not sure how much impact I can have on them to change the way their code is structured but if I give them a few options and show what extra work each involves then hopefully they'll figure it out for themselves.

[halbarad]

So as part of my role I'm doing a lot more consultancy and getting people onto VSTS from whatever they were on before. Mostly this involves moving from something to Git, which has its various fun problems associated with it.

The other thing I'm doing now is giving basic git training. Which isn't too bad, I know the basics myself and the main concepts to get across but I'm wondering if people have suggestions for things that are done wrong far too often that need to be stressed more to people who are new to git? Branching is a big one, especially from VCS where it's not a simple operation, what a commit is and when to do it seems to be another I've found in the 1 session I've done so far. I've got at least another 2 to do in the near future and no doubt a lot more.

[Rakshasa The Cat]

Besides never commit directly to the main branches?

Do not allow people to force push changes to the remote repository. If they need to change something they fucked up and pushed it is pretty much always better to revert in a new commit.

[56k Lagman]

you programmers think you are hot shit

[halbarad]

Besides never commit directly to the main branches?

Do not allow people to force push changes to the remote repository. If they need to change something they fucked up and pushed it is pretty much always better to revert in a new commit.

Yeah, I'm pushing for branch security through VSTS so you can't push to master and everything is handled with PRs, probably even the merges from feature branches into develop.

[Rakshasa The Cat]

you programmers think you are hot shit

Because we are.

[56k Lagman]

you programmers think you are hot shit

Because we are.

Yeah well maybe you are but I make a decent living from NOT being a programmer how about that

[Rakshasa The Cat]

Yeah well maybe you are but I make a decent living from NOT being a programmer how about that

Bet you die ever day you wake up and realize you do nothing to improve society in general.

[56k Lagman]

Yeah well maybe you are but I make a decent living from NOT being a programmer how about that

Bet you die ever day you wake up and realize you do nothing to improve society in general.

jokes on you mate every day I wake up and remember that sentience is a curse not a blessing and that no matter how far we stretch as a species across the galaxy there will never be any true meaning behind it

[Rakshasa The Cat]

jokes on you mate every day I wake up and remember that sentience is a curse not a blessing and that no matter how far we stretch as a species across the galaxy there will never be any true meaning behind it

Yeah, except I'll know my time here will keep bits flipping for decades after I'm dead.

[56k Lagman]

you wont know though buddy because you'll be dead just like the rest of us

[erichkknaar]

That is not dead which can eternal lie, and with strange aeons even death may die.

[elmicker]

Branch-driven workflows (think GitFlow) are passé now. We've gone full circle to patch-driven, gerrit-mediated workflows, aka Linus was right all along.