4 ms·
I remember being the big innovation over svn being merging. There were others things, obviously, but the distributed model + easy merges is what I remember.
by rmwaite 4mo ago
I remember being the big innovation over svn being merging. There were others things, obviously, but the distributed model + easy merges is what I remember.
- y1n0 4mo agoYes, that's true, merging. Which is what made branching a reasonable thing to do.
- kccqzy 4mo agoIf the big innovation over svn is merging for git, then the big innovation here is conflicts. I hate the fact that git requires you to stop everything and fix the merge conflict when you merge. I especially hate the fact that when rebasing in git sometimes it requires you to solve conflicts one by one. The big innovation here is jj does not require you to resolve merge conflicts in a timely manner; it simply records the fact that there are conflicts in the file and you go about your ways. You don't ever have to abort like `git rebase --abort` or `git merge --abort`.