The UX of jj's builtin merge editor finally became
too much for me. So, I looked at the list of merge
tool options, saw vimdiff, and thought, “Oh, cool,
I know how to use vimdiff.” So, I launched
jj config edit --user, added a ui section, and
set merge-editor to vimdiff. With the new
config, I ran jj resolve again. It was at that
point that I realized that I do not, in fact, know
how to use vimdiff: I only know how to use
vimdiff with two buffers. What appeared in my
terminal was a 4-pane monstrosity. Why are there
four panes? I'm trying to resolve conflicts
between only two changes on only one file. For a
moment, I nearly go down a rabbit hole, because
this
says that by default, vimdiff is “barely useable”
[sic]. Should I be installing some addon or a
Python script? Apparently there are tradeoffs.
I just want to resolve these conflicts without
doing line-by-line approvals for how ever many
hours that would take.
Accordingly, I ran away in terror, installed meld,
set merge-editor to meld, and went clicky-clicky
in the GUI. I'm not happy using a GUI, but at least
it didn't have a mysterious extra buffer to confuse
and taunt me.