News for hackers. Stuff that matters.
Re:Git techniques by globular-toast on Sunday November 14, 2021 @02:42PM (#29219949)
Care has to be taken that the trunk branch actually is the first parent in each merge commit. Maybe it's unlikely to go wrong in practice, but it's certainly possible to have a merge where the parents are the "wrong way around" thus messing up your first parent strategy.

Also, "git praise"? Is that really a thing now? Talk about not understanding programmer humour.

Re:Git techniques by WorldMaker on Monday November 15, 2021 @01:14PM (#29230531)
In most cases where people are using a PR system as the primary integration point, I've not seen a single PR system that has a problem with sometimes getting the parents in merges backwards. The only time I've seen that is junior developers making merges they shouldn't have been (and are the same developers I would never trust with rebase, even just in their own branches) and there is a way to rebase merge parents if you really want to pull out your rebase fu for something.

> Also, "git praise"? Is that really a thing now? Talk about not understanding programmer humour.

git praise has been a standard git alias for git blame for several years now. I'd prefer if git had followed most other VCSes and named it git annotate rather than making it a micro-aggression out of the box, but yeah one person's micro-aggression that makes a papercut in daily workflows is another person's punch down "humour", I guess. I'm glad you seem to enjoy it, I don't appreciate it.