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:00PM (#38225108)
> I intentionally don’t want my half-broken commits to be in the production branch.

That makes no sense. What does it matter that interim versions from a merge might not work, what matters are the milestones like merges and tags. Basically you're imposing a silly aesthetic restriction on what's supposed to be a functional tool.

[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by singingfish on Friday November 10, 2023 @11:43PM (#38227695)
The whole argument feels a bit People's Liberation Front of Judea to me. On the other hand I do have strong views on the matter, and I am pretty certain that my views are pretty close to the correct ones.
[ Parent | on HN ]
Re:Git cherry-pick and revert use 3-way merge by baq on Saturday November 11, 2023 @05:31AM (#38229068)
My silly aesthetic restriction is ‘tests pass’ and my branch commits don’t have this quality in all cases.
[ Parent | on HN ]