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 naasking on Friday November 10, 2023 @05:05PM (#38225163)
Who is "everyone", in "it would make everyone's lives worse"? Worse in what way, exactly? What quantifiable metric are you using to judge "worse"?

I agree that some feature branches can be developer diaries, but I'm not sure why throwing away the diary is a good thing, and why the repo should only contain "releasable products". Sounds like an aesthetic preference rather than something concrete.

[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by yencabulator on Friday November 10, 2023 @05:52PM (#38225644)
> why the repo should only contain "releasable products"

This is your chance to learn about git bisect.

[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by baq on Saturday November 11, 2023 @05:32AM (#38229083)
It’s called continuous delivery: I want the main branch to be in a releasable state always. If it isn’t, tickets are raised and people are paged.
[ Parent | on HN ]