Handling patch-releases made on main while a feature is still in progress (or minor releases while a breaking change is in progress)

[BatmanAoD]

When working on a branch, I sometimes make a prerelease. If I am working on a branch that does a feature bump (or breaking change), and I merge from the trunk branch after there has been a patch release there, then Knope doesn't take into account my prior prerelease tags, because it sees that there is a more recent release that is not an ancestor of the prior prereleases. If instead I rebase onto the trunk, I lose the tags unless I manually move them¹; but in general moving tags isn't really a good practice anyway.

One fairly simple workaround I've thought of is to just manually create a new empty commit and tag it with the next prerelease version, so that the next prerelease after that starts with the correct number.

Any other suggestions for how to deal with this? #991 would be helpful here as well.

Footnotes

1. I've asked about having a simpler way to rebase and move the tags to deal with this case: https://github.com/jj-vcs/jj/discussions/9587 ↩