alt Hacker NewsGit rebases don't work if there are conflicts, jj doesn't have this problem. Also idk if you can rebase onto multiple parents with git but jj can do it.
Git rebases don't work if there are conflicts, jj doesn't have this problem. Also idk if you can rebase onto multiple parents with git but jj can do it.
Can you explain how conflicts are not conflicts?
If I change a line of code several times and rebase on to a branch that changed the same lines of code, how are you sure what the right one is?