3 ms·
Isn't that just a merge, but done one commit at a time?
by domlebo70 8y ago
Isn't that just a merge, but done one commit at a time?
- doombolt 8y agoNo 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.
- jamietanna 8y agoGP'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