resolve after a rebase reporting no conflicts when there definitely is one

[alterNERDtive]

After a rebase:

New conflicts appeared in 1 commits:
  oo(slnzx) 21e(31a3) (conflict) XXXXXX
Hint: To resolve the conflicts, start by creating a commit on top of
the conflicted commit:
  jj new oo(slnzx)
Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you can inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit.

Log shows a conflict:

×  oo(slnzx) XXXX (conflict)

⇒ jj new oo 
Working copy  (@) now at: z(omqomz) f(5ec299) (conflict) (empty) (no description set)
Parent commit (@-)      : o(oslnzx) 2(1e31a3) (conflict) XXXXXX
Added 0 files, modified 8 files, removed 0 files
Warning: There are unresolved conflicts at these paths:
<file>    2-sided conflict
⇒ jj resolve
Error: No conflicts found at this revision
⇒ jj diff
Resolved conflict in <file>:
    ...
⇒ grep conflict <file>
<<<<<<< conflict 1 of 3
>>>>>>> conflict 1 of 3 ends
<<<<<<< conflict 2 of 3
>>>>>>> conflict 2 of 3 ends
<<<<<<< conflict 3 of 3
>>>>>>> conflict 3 of 3 ends
⇒ jj squash
[…]
⇒ jj prev
[…]
⇒ grep conflict <file>
<<<<<<< conflict 1 of 3
>>>>>>> conflict 1 of 3 ends
<<<<<<< conflict 2 of 3
>>>>>>> conflict 2 of 3 ends
<<<<<<< conflict 3 of 3
>>>>>>> conflict 3 of 3 ends

When trying to edit the conflicted commit instead:

⇒ jj resolve
Error: No conflicts found at this revision
⇒ grep conflict <file>
<<<<<<< conflict 1 of 3
>>>>>>> conflict 1 of 3 ends
<<<<<<< conflict 2 of 3
>>>>>>> conflict 2 of 3 ends
<<<<<<< conflict 3 of 3
>>>>>>> conflict 3 of 3 ends

Also after editing the conflicted revision, it no longer shows as conflicted in the log 🤔

I feel like I’m doing something wrong somewhere.

[PhilipMetzger]

This seems to be a bug, as we should detect the conflict when materializing the revision during edit but maybe Yuya or Scott have a better idea.

[yuja]

I can't guess what would have happened from the output. If some background processes were involved, jj op log -p would help. Running commands with --ignore-working-copy will also help to see if snapshotting caused the problem.

[alterNERDtive]

If some background processes were involved, jj op log -p would help.

None I would know of, except the starship prompt.

Running commands with --ignore-working-copy will also help to see if snapshotting caused the problem.

Like, all of them?