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
Much less this handwavy commit exposed to uninterested parties.