merge commit sometimes confuses Github PR display

[dimfeld]

Sometimes when I create a merge commit with something like jj new BOOKMARK main; jj commit -m 'merge main' it works fine and the history looks good, but then the Github PR page seems to think that all the commits on main that were merged in are actually part of the PR, and it shows all those commits and changed files.

This doesn't seem to happen consistently; it might be related to if I resolved conflicts in in the merge commit but I'm not sure.

I usually rebase instead of merge, so I don't encounter this too often anyway, but does anyone know if there's some trick to avoiding this?

[PhilipMetzger]

Sometimes when I create a merge commit with something like jj new BOOKMARK main; jj commit -m 'merge main' it works fine and the history looks good, but then the Github PR page seems to think that all the commits on main that were merged in are actually part of the PR, and it shows all those commits and changed files.

Yes, this is because the parent order in jj new <parent> <parent> is significant, the first parent should be main/master/trunk.

[dimfeld]

I see. Thanks!

[dimfeld]

Coming back to this, I realize my wording of the question was ambiguous. I was trying to bring the feature branch up to date with main, without merging it, and in that case main should be second. But that was not really clear from how I asked it.

So for anyone else who comes across this post:

• Merge the branch into main, like merging a completed PR: jj new main BRANCH
• Merge main into the branch, to bring it up to date with the latest trunk: jj new BRANCH main

Apologies for the unclear wording and thanks again for the quick answer :)