GitHub merge and rebase creates a new commit ID causes divergent changes and jj git fetch

[weizheheng]

Wondering how the community handles merging using jj with GitHub?

I'm trying jj out and have a question on the following workflow:

1. jj new to start a new change
2. Make some changes and jj commit -m "message" to set the description and start a new change.
3. Create a bookmark with jj bookmark create name -r @-
4. jj git push --allow-new
5. Create a pull request on GitHub, and merge it with the Rebase and Merge button on the GitHub UI.
6. Somehow the commit ID is updated and no longer the same as the local version.
7. Doing jj git fetch and starts seeing divergent changes.

[scott2000]

If you delete the branch in GitHub using the "delete branch" button on the PR page after merging the PR, then jj git fetch will automatically abandon the old version of the changes that were rebased, assuming you don't have any other branches on top of them. This will avoid the divergent changes.

Otherwise, if you do have another branch on top of the rebased branch, then you can just rebase that other branch using something like jj rebase -b <other branch> -d main, and jj will automatically abandon any duplicate commits, resolving the divergence.

In the future, we'd like for this to be done automatically with a new jj sync command I believe, but it hasn't been implemented yet.

[weizheheng]

Hi @scott2000 , thank you so much. I tested it again according to your suggestion, and can confirm no longer seeing the divergent.