Remix.run Logo
tcoff91 2 hours ago

I rebase stacked diffs all the time so jj makes my life so much easier because its rebasing is much more ergonomic than git.

beanjuiceII an hour ago | parent [-]

this seems very easy in git tho how much easier can it get, do you have an example of each of them?

dpatterbee an hour 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 30 minutes 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?