News for hackers. Stuff that matters.

A comment on Stop cherry-picking, start merging, Part 1: The merge conflict. Parent comment

Re:Stop cherry-picking, start merging, Part 1: The merge con... by domlebo70 on Tuesday October 16, 2018 @02:39AM (#18227161)
Isn't that just a merge, but done one commit at a time?
[ Parent | on HN ]
Re:Stop cherry-picking, start merging, Part 1: The merge con... by doombolt on Tuesday October 16, 2018 @02:48AM (#18227198)
No it is not, because there is no mystic handwavy commit involved. You just apply a patch basically.

Much less this handwavy commit exposed to uninterested parties.

[ Parent | on HN ]
Re:Stop cherry-picking, start merging, Part 1: The merge con... by jamietanna on Tuesday October 16, 2018 @05:46AM (#18228004)
GP's comment was that a _rebase_ is a merge, one commit at a time, due to replaying each commit over whatever was there.

Although you still fix the conflicts each time, it means you don't have many merge commits as you go along

[ Parent | on HN ]