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.
Re:JJ Cheat Sheet
by martinvonz on Wednesday February 12, 2025 @03:14AM
(#43023059)
You can try a different conflict marker style: https://jj-vcs.github.io/jj/latest/config/#conflict-marker-s...
I do end up with descriptionless bookmarks that won’t push without a flag. So, I’m still doing something wrong.
But it’s already saved me a few times this week during some gnarly refactoring and merges.