News for hackers. Stuff that matters.

A comment on Git cherry-pick and revert use 3-way merge. Parent comment

Re:Git cherry-pick and revert use 3-way merge by yencabulator on Friday November 10, 2023 @05:51PM (#38225636)
> still require production-ready commits in feature branches.

I make a point of requiring that anyway. You gotta learn to build incrementally, repeatedly landing squashed mega-commits into main is just a recipe for future pain. To level up as a software developer, learn to create incremental work. git rebase -i is your friend.

[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by baq on Saturday November 11, 2023 @05:35AM (#38229108)
I’ve had my share of rebase -i and I’ve gotten fed up with it, though GitHub plays no small part in that. Years ago when I worked with gerrit it made more sense. I just stopped caring because of the tool.
[ Parent | on HN ]