3 ms·
I’ve been using it for a bit. It is magical. I had some merge conflicts in a GitHub PR. I pulled everything down with jj, and the conflicts were gone. Pushed an
by christophilus 2y ago
I’ve been using it for a bit. It is magical. I had some merge conflicts in a GitHub PR. I pulled everything down with jj, and the conflicts were gone. Pushed and presto.
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.
- rtpg 2y agoUnfortunately 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.
- martinvonz 2y agoYou can try a different conflict marker style: https://jj-vcs.github.io/jj/latest/config/#conflict-marker-style https://jj-vcs.github.io/jj/latest/config/#conflict-marker-s...