How do I blow away local changes and revert back to bookmark@origin?

[jeanbza]

$ jj
@  qtwplzzp [email protected] 2025-02-19 15:31:59 tweaks* f099380c
│  Various small tweaks.

I know that I have changes as evidenced by the * after tweaks. And I can see them with jj diff --from tweaks@origin. But, how do I blow those changes away? I want to go back to what's at tweaks@origin.

[jeanbza]

FWIW this would perhaps be something like git reset --hard origin/tweaks.

[ucirello]

That's what I use: jj new; jj restore -f tweaks@origin -t @ - and then I rebase as necessary.

[ilyagr]

I think jj branch move tweaks --to tweaks@origin -B; jj new tweaks should do it. You can then jj abandon any revisions you don't need (this could be necessary if you get divergent change ids).

In older jj versions (probably including the stable release), the branch might seem to disappear before you do jj new tweaks because it ends up at a hidden revision. In the upcoming release, jj branch move should un-hide the revisions the branch moved to.

[jeanbza]

Thanks all, this is exactly what I was looking for.