Flip branching scheme: v2 on master, 1.x maintenance on v1.x#502
Merged
Conversation
Post-v1.1 the dominant development line is v2, so the scheme documented in cellpy-v2-branching.md is inverted: master carries v2 development (epic #402), and the new v1.x branch (created at v1.1.0.post1) carries fixes-only 1.x maintenance. The old long-lived v2 branch is retired; its unique commits were sync/workflow artifacts already on master. - Rewrite cellpy-v2-branching.md for the new scheme (PR targets, backport direction master->v1.x via cherry-pick, per-line cellpycore pin policy, release lines, protection notes, scheme-change marker for stale clones). - Update release.yml tag/branch validation: v1.* tags must sit on v1.x, v2.* (stable or pre) on master; stop fetching the retired v2 branch. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Bugbot is not enabled for your account, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Approved. Cursor Bugbot was not configured on this PR, so that signal was skipped; the changes are documentation and matching release workflow validation for the post-v1.1 branching flip. No additional reviewers were assigned.
Sent by Cursor Approval Agent: Pull Request Router and Approver
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implements the post-v1.1 branching flip agreed for the v2 cycle (epic #402).
New scheme
masterv2.0.0a1... thenv2.*v1.xv1.1.0.post1)v1.1.1, ...Shared fixes land on master first and are cherry-picked to
v1.x; no wholesalemerges between the lines. The old long-lived
v2branch is retired (its uniquecommits were sync/workflow artifacts already on master via #424/#417).
Changes
cellpy-v2-branching.mdrewritten for the new scheme, with a scheme-changemarker for stale clones, backport procedure, per-line
cellpycorepin policy(
v1.xstays on==0.2.1), release table, and GitHub-hygiene notes.release.ymltag/branch validation updated:v1.*tags must sit onv1.x,v2.*(stable or pre) on master; stop fetching the retiredv2branch(which would have broken the job once that branch is deleted). Existing
v1.1.0*tags remain valid —v1.xpoints at that exact commit.Follow-ups (repo settings, not in this PR)
v1.x; drop protection onv2and delete it.v1xlabel for backport PRs; thev2label is obsolete for targeting.🤖 Generated with Claude Code