After cutting v0.2.21 (PR #364 → #365), release-please bumped .release-please-manifest.json, pyproject.toml, and CHANGELOG.md on main (commit 2712e49). dev still reads 0.2.20, and main is 3 commits ahead.
This issue tracks the main → dev back-merge so main becomes an ancestor of dev and future dev → main release PRs stop re-conflicting.
- Merge the back-merge PR with
--merge (a real merge commit), never squash — otherwise main never becomes a dev ancestor.
After cutting v0.2.21 (PR #364 → #365), release-please bumped
.release-please-manifest.json,pyproject.toml, andCHANGELOG.mdonmain(commit2712e49).devstill reads 0.2.20, andmainis 3 commits ahead.This issue tracks the main → dev back-merge so
mainbecomes an ancestor ofdevand futuredev → mainrelease PRs stop re-conflicting.--merge(a real merge commit), never squash — otherwisemainnever becomes adevancestor.