JJ conflict format

[gw-vastdata]

Hi, general question.

I remember some time ago I looked at a conflicted change and saw a default README.md that explains this is a conflict, and two repo roots that contained the conflicted versions.

However, looking at a conflicted change now, I don't see this structure.

Do I remember wrong, or was it changed recently?

(It came up when I was explaining collaborative conflict resolution to a colleague and I wanted to show this, but couldn't find it...).

[scott2000]

Since jj uses Git as its backend, it needs to store conflicts in Git as well. But Git doesn't support committing conflicts, so they're stored as commits that contain files like this:

• .jjconflict-base-0/
• .jjconflict-side-0/
• .jjconflict-side-1/
• README

The .jjconflict-* directories contain the different sides and bases of the conflict, and the README explains:

This commit was made by jj, https://github.com/jj-vcs/jj.
The commit contains file conflicts, and therefore looks wrong when used with plain
Git or other tools that are unfamiliar with jj.

The .jjconflict-* directories represent the different inputs to the conflict.
For details, see
https://jj-vcs.github.io/jj/prerelease/git-compatibility/#format-mapping-details

If you see this file in your working copy, it probably means that you used a
regular `git` command to check out a conflicted commit. Use `jj abandon` to
recover.

This is just an implementation detail, so it's only visible when inspecting a conflicted commit using git or if you incorrectly use git to check out a conflicted commit. If you only use jj commands, there's no way to see the README file.

[gw-vastdata]

Thanks!

If you only use jj commands, there's no way to see the README file.

That's the bit I was missing.