After the v0.2.14 release, main carries the release-please commit (chore(main): release 0.2.14 — CHANGELOG, pyproject.toml, .release-please-manifest.json bumps) that dev lacks. Back-merge main into dev to resync. Clean fast-forward — 0 conflicts; only the 3 release-managed files change. Merge the PR with a merge commit (gh pr merge --merge), not squash.
After the v0.2.14 release, main carries the release-please commit (chore(main): release 0.2.14 — CHANGELOG, pyproject.toml, .release-please-manifest.json bumps) that dev lacks. Back-merge main into dev to resync. Clean fast-forward — 0 conflicts; only the 3 release-managed files change. Merge the PR with a merge commit (gh pr merge --merge), not squash.