Unfortunately my merging experience has been mixed. I find the idiosyncratic merge markers to be overtly futzy (why are you indenting everything by a single character?), and the conflict resolution still is quite hand-hold-y.
It's never been wrong, but I am slightly unconvinced at how well merge conflict resolution works relative to git + rerere.
Comments
Unfortunately my merging experience has been mixed. I find the idiosyncratic merge markers to be overtly futzy (why are you indenting everything by a single character?), and the conflict resolution still is quite hand-hold-y.
It's never been wrong, but I am slightly unconvinced at how well merge conflict resolution works relative to git + rerere.
You can try a different conflict marker style: https://jj-vcs.github.io/jj/latest/config/#conflict-marker-s...