How to fix "Revset xt resolved to more than one revision" state?

[davidpdrsn]

Recently I had a branch that was part of a larger stack of PRs. One of my co-workers (using git) then pushed something to that branch. That put my local repo into a state I haven't seen before after I did jj git fetch.

I looked like this (descriptions and bookmarks elided), lots of ?? after some change ids

❯ jj log
○  xt?? 57
│  ...
○  ox?? 4a
│  ...
○  wt?? 07
│  ...
○  trv?? 8f
│  ...
○  om?? 5b
│  ...
○  k?? ba
│  ...
○  vns?? 24b
│  ...
○  p?? 68
│  ...
○  lr?? 8c
│  ...
◆  xk main f9
│  ...
│ ○  oz 53
│ │  ...
│ ○  rs 33
│ │  ...
│ ○  tx de
│ │  ...
│ ○  mz bf
│ │  ...
│ ○  qt 92
│ │  ...
│ ○  mx 88
│ │  ...
│ ○  xt?? 17
│ │  ...
│ ○  ox?? 3d
│ │  ...
│ ○  wt?? 4f
│ │  ...
│ ○  trv?? 24a
│ │  ...
│ ○  om?? 9e
│ │  ...
│ ○  k?? 3f
│ │  ...
│ ○  vns?? 04
│ │  ...
│ ○  p?? b2
│ │  ...
│ ○  lr?? f4
├─╯  ...
◆  yk 7
│  ...
~

Showing one of the changes with ?? says

❯ jj show xt
Error: Revset `xt` resolved to more than one revision
Hint: The revset `xt` resolved to these revisions:
  xt?? 57 push-wtqmqortkzry | ...
  xt?? 17 ...
Hint: Some of these commits have the same change id. Abandon the unneeded commits with `jj abandon <commit_id>`

I tried running jj abandon on a few different commits but that just resulted in lots of conflicts further down the tree.

I did manage to get things back into working order again by removing the branch both locally and on github. But that now means I don't have those changes locally (which is fine in this specific case) but I'm wondering how I could have resolved the issues for real?

I think I someshow should have rebased mx..oz but couldn't figure that out either.

Besides this little hickup I'm really enjoying jj and don't imagine switching back to git 🎉

[PhilipMetzger]

This is divergence which means that the change-id no longer resolves to a single change (since there are multiple with different versions). See this FAQ answer https://jj-vcs.github.io/jj/latest/FAQ/#how-do-i-deal-with-divergent-changes-after-the-change-id

[PhilipMetzger]

you probably should remove your local version of the respective change since your coworkers are now the "canonical" ones.

[davidpdrsn]

Thanks! Hadn't seen that FAQ item. I'll keep jj duplicate in mind. Probably would have been helpful.