Removing local branch that was merged with rebase on GitHub

[link2xt]

I have a repository on GitHub that has the settings "Allow rebase merging" and "Automatically delete head branches". Using jj 0.24.0, I create PRs with jj git push -C @ (from non-empty commit) and once PR is approved and CI passes, I click "Rebase and merge" in the GitHub web interface. After jj git fetch, my local branch is still there even though all the changes are in main@origin bookmark already. How to get rid of duplicate changes locally? With git I would just delete local branch, but with jj I have anonymous branch that clutters the log. Also with git if I try to rebase it on top of main, git recognizes that changes are already merged and drops "cherry-picked" commits, while jj generates conflicts.

[link2xt]

I tried again with another branch, and this time it got detected. I merged link2xt/wvokswxpwzss with GitHub web interface and then fetched:

$ jj git fetch
bookmark: link2xt/wvokswxpwzss@origin [deleted] untracked
bookmark: main@origin                 [updated] untracked
Abandoned 1 commits that are no longer reachable.
Rebased 1 descendant commits
Working copy now at: kzzxutvm db55011b (empty) (no description set)
Parent commit      : spxutknp 7e5cec66 refactor: simplify `self_sent` condition
Added 0 files, modified 1 files, removed 0 files

Bookmark link2xt/wvokswxpwzss was successfully deleted during jj git fetch. Maybe previous time I had some experimental commits on top of the tracked branch. I should probably read https://jj-vcs.github.io/jj/latest/bookmarks/ to understand what happened and why it is possible that sometimes rebase-merged commits are removed and sometimes remain in the local copy after jj git fetch. I have not read the documentation yet because I started with https://steveklabnik.github.io/jujutsu-tutorial/

[evmar]

I ran into this too. Here was the repo state:

$ git show-branch wip origin/main
* [wip] split progress into multiple modules
 ! [origin/main] split progress into multiple modules
--
 + [origin/main] split progress into multiple modules
 + [origin/main^] always show command status + output, unless success+empty
 + [origin/main~2] put bindings tests in separate module
 + [origin/main~3] obsolete remark, basic showIncludes now exists
 + [origin/main~4] Paraphrase code a bit to silence a warning
 + [origin/main~5] Bump MSRV to 1.77 & start using cstr literals
*  [wip] split progress into multiple modules
*  [wip^] always show command status + output, unless success+empty
*  [wip~2] put bindings tests in separate module
*  [wip~3] obsolete remark, basic showIncludes now exists
*+ [origin/main~6] fix variable scope lookup

you can see the last 4 commits from 'wip' were rebased onto origin.

When I used jj to rebase the wip branch onto main the 'obsolete remark' change was made empty but the others were conflicts:

$ jj op show 0943e7589f8a
0943e7589f8a evmar@..., lasted 80 milliseconds
rebase commit 667ed2cdc69f0f49a7753aaa011ea2792cb17705 and descendants
args: jj rebase -d main

Changed commits:
○  Change stskwvwuyztt
│  + stskwvwu 381e8eb7 (empty) wip
│  - stskwvwu hidden 6e2bbd9d (empty) wip
○  Change rwuzlpnrwuoz
│  + rwuzlpnr 0bfe54a7 wip* | split progress into multiple modules
│  - rwuzlpnr hidden aaeb90dc wip@origin | split progress into multiple modules
○  Change wkozmvskzmzs
│  + wkozmvsk 657781c8 (conflict) always show command status + output, unless success+empty
│  - wkozmvsk hidden b1b337b0 always show command status + output, unless success+empty
○  Change wtsxmzpsyvkz
│  + wtsxmzps 38cf80a0 (conflict) put bindings tests in separate module
│  - wtsxmzps hidden 2395a133 put bindings tests in separate module
○  Change mrvyuonumpvq
   + mrvyuonu f4b3a346 (empty) obsolete remark, basic showIncludes now exists
   - mrvyuonu hidden 667ed2cd obsolete remark, basic showIncludes now exists

A workaround that worked was to use git rebase instead, which successfully recognized what was going on. 😬

$ git rebase origin/main
warning: skipped previously applied commit 667ed2c
warning: skipped previously applied commit 2395a13
warning: skipped previously applied commit b1b337b
warning: skipped previously applied commit aaeb90d