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.
Much less this handwavy commit exposed to uninterested parties.
Although you still fix the conflicts each time, it means you don't have many merge commits as you go along