During the v1.0.0 release, develop→main and the back-merge (#222) were squash-merged. A squash collapses the merge, so the release merge commit and the CI-generated Package.swift bot commit on main do not become ancestors of develop.
Consequence: main accumulates commits (release merges + Package.swift bot updates) that never flow back into develop by history, so each subsequent release shows main "ahead" and risks the same divergence that required a manual reconcile this release (when main had unmerged commits #217/#218 + a competing release commit).
Proposal: adopt a true gitflow back-merge — after each release, merge main into develop with a real merge commit (--no-ff, not squash), and consider a merge commit (not squash) for develop→main. Document the release branching/merge procedure in CONTRIBUTING.
During the v1.0.0 release,
develop→mainand the back-merge (#222) were squash-merged. A squash collapses the merge, so the release merge commit and the CI-generatedPackage.swiftbot commit onmaindo not become ancestors ofdevelop.Consequence:
mainaccumulates commits (release merges + Package.swift bot updates) that never flow back intodevelopby history, so each subsequent release showsmain"ahead" and risks the same divergence that required a manual reconcile this release (whenmainhad unmerged commits #217/#218 + a competing release commit).Proposal: adopt a true gitflow back-merge — after each release, merge
mainintodevelopwith a real merge commit (--no-ff, not squash), and consider a merge commit (not squash) fordevelop→main. Document the release branching/merge procedure in CONTRIBUTING.