Dusty Pomerleau on Nostr: npub18gerz…qz0r0 For me, the main issue with conflicts is that they prevent the ...

npub18gerznd4taq027mz6apew3aj7w563qjtcmx3ktnh2hhn5qeqznhsgqz0r0 (npub18ge…z0r0) For me, the main issue with conflicts is that they prevent the merge/rebase and leave you in limbo. Since switching to jj, where conflicts are first-class and the merge/rebase always succeeds, I find that dealing with conflicts after the fact doesn't bother me nearly as much. Although having easy undo for any operation is probably another factor in how it feels, separate from jj's approach to merging.