5 ms·
To be fair, most of the its difficulty is realized when you're stuck with a teammate rewriting history. Who, much like anyone anyone doing the same, hasn't both
by spookie 1y ago
To be fair, most of the its difficulty is realized when you're stuck with a teammate rewriting history. Who, much like anyone anyone doing the same, hasn't bothered reading a book explaining things.
- baq 1y agoIf you don't rewrite history in git, I don't want to bisect in your repos. If you push rewritten history to master, you're a git. Conclusion: learn your tools.
- mkesper 1y agoThe modern workflow is just to let GitHub squeeze yor shit commits into one and then rebasing that.
- baq 1y agoHardly anything modern about it, but it's a way of keeping a somewhat sane history. Certainly better than merging 'fix' 'fix' 'fix comments' into master. The thing is, we could have done better (and have been) since before git even existed.
- cmrdporcupine 1y agoThere are legit reasons to have a series of commits within one PR, and rebase and merge them as is, and use amend/fixup and force pushes to maintain them cleanly. It's not my favourite process, but...
- vvillena 1y agoThe "squash everything" mantra turns git commit history into a series of snapshots devoid of any logical notion about how code evolves. Squashed commits are strictly worse than plain, non-fast-forwarded merges from rebased branches.
- spookie 1y agoNot a single soul besides the one rewriting history knows what they're in for after the fact. It's a recipe for disaster. Unless you mean squashing commits, which I don't consider rewriting history, just a retelling of the fact. Still, it's something one can only do very sporadically, or at known periods of time. I 'm sure others would be more pedantic about it and this wasn't clear above.
- tester756 1y agoNo, git's CLI is terrible mess.
- jamienicol 1y agoThat problem is solved by preventing forced pushes. Rewriting history locally is encouraged.
- Tainnor 1y agoPrevent forced pushes on protected branches (develop, main, hotfix etc.). I don't care if somebody force pushes their private feature branch.
- cmrdporcupine 1y agoForce pushing onto PR branches is the only way to make the commit history in them sane. But GH's PR process is broken anyways. I miss Gerritt.