Post

git experts should try #jj-vcs pksunkara.com/thoughts/git...

Two questions immediately come to mind... how close to "1.0" is it (should I expect it to be evolving in a disruptive way if I try to use it?) and for the example of "just use this edit command and jj will automatically rebase behind the scenes", how is conflict resolution handled? (the hard part).

How does that work? Do conflicting changes go to some staging area until resolved?

It’s built into the commit, and the UI will show that it’s conflicted and ask you to resolve it when you wish

Have the conflict just go into the repository (breaking the (local) build) build feels weird to me... but is probably still more sensible than the git workflow of leaving you sitting in the middle of the partially completed rebase or whatever with everything busted.