| ▲ | beanjuiceII 3 hours ago |
| this seems very easy in git tho how much easier can it get, do you have an example of each of them? |
|
| ▲ | dpatterbee 2 hours ago | parent [-] |
| 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. |
| |
| ▲ | aidos 2 hours ago | parent [-] | | 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? | | |
| ▲ | sunnyps 41 minutes ago | parent [-] | | JJ can save conflict related state with the change so that you don't need to resolve a conflict in the middle of a stack of changes for rebasing to continue for the remaining changes. Concretely, it uses a "conflict algebra" where it can track the impact of a conflict as it propagates through the stack of rebased changes: https://docs.jj-vcs.dev/latest/technical/conflicts/ |
|
|
