Merge options for JJ compatible in VSCode?

[MarskyMessier]

I've been enjoying JJ a lot and making good use of it thru recommendation of a friend, however I primarily work with code that is meant to have extensions & plugins attached to it (meaning remote with same base repo but some file changing being merged together). The 3way merge is an absolute nightmare in those cases because git trips a lot and hallucinates some merge conflicts, so inline merge is much more intuitive for me to deal with, I do that in VSCode as it's my primary tool for that. However I found out that VSCode doesn't highlight merge when it's inline for JJ, and the 3 way view sometimes completely trips up and shows an empty view (not sure on that behavior).
I was wondering if there's an option, extension, or a way to have VSCode highlight merge differences inline specifically for jj ? It does that with git quite nicely, but not with jj.

[joyously]

Is it VSCode itself, or an extension?

[martinvonz]

Or change VSCode so it understands the conflict markers :) @kevincliao has done this for our Google-internal VSCode-based IDE. Kevin, do you think you could send a PR for the upstream VSCode project?

[MarskyMessier]

Ohh I'll definitely check the diff format, thank you so much! I haven't touched much of the settings for jj so that was very helpful.

[martinvonz]

I think Philip meant to point you to https://jj-vcs.github.io/jj/latest/config/#conflict-marker-style

[MarskyMessier]

Changing the settings to support diff3 marker style did it! Tysm, It's much easier to manage inline merges with that, I'm also intrigued with a potential update to VSCode understanding JJ markers easier!

[kevincliao]

Note that, since this feature does not require touching any VS Code internals, it only makes sense to develop it as an extension. I think we can ask VS Code upstream about merging the jj-merge-conflict extension internally at Google into VS Code as a builtin extension, but it might be challenging to convince. Given that the extension is still fairly new and may require more changes, it's probably easier for us to develop it as a standalone open-source extension first, and merge into VS Code upstream as a builtin extension once it's more mature (and if VS Code upstream allows, of course).

[ilyagr]

You could try @sheremetyev 's www.visualjj.com/beta, which definitely supports merging. I think https://github.com/keanemind/jjk doesn't yet, but might in the future.

I'm not 100% sure it will work better than jj resolve --tool vscode, but it is very possible.