chore: migrate from vX.Y-dev branching model to single dev branch#778
Conversation
Switch the development model away from per-release `vX.Y-dev` branches (`v0.40-dev`, `v0.41-dev`, `v0.42-dev`, each going stale after its release) to a single permanent `dev` branch as the default for active development, with `master` renamed to `main` to track the latest tagged release. Release branches (`chore/release-vX.Y.Z`) are still cut from `dev` per release for the review window, then merged back. Updates the file-level references that hardcode the old model: - CI workflow triggers (`pre-commit`, `rust`, `sanitizer`, `conflict-check`) now fire on pushes to `main` / `dev` instead of `master` / `v**-dev`. - `CLAUDE.md`, `AGENTS.md`, `CONTRIBUTING.md`, `README.md` describe the new branching model and target branches. - README codecov badges point at `branch/main` and `branch/dev`. The actual GitHub-side actions (rename `master` -> `main`, rename `v0.42-dev` -> `dev`, change default branch, update branch-protection rules) are repo settings and must be performed by an admin separately. Order matters: tag `v0.42.0` from `v0.42-dev` first, then perform the GitHub renames, then merge this PR against `dev`. To fix it up locally just run: ``` git branch -m v0.42-dev dev git fetch origin git branch -u origin/dev dev git remote set-head origin -a ```
|
Warning Rate limit exceeded
You’ve run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughThis pull request updates the repository's Git branching convention from ChangesBranch Naming Convention Migration
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@CONTRIBUTING.md`:
- Line 70: Replace the hardcoded branch name in the heading string
"Prerequisites that a PR must satisfy for merging into the `main` branch:" with
a target-branch-agnostic phrase such as "Prerequisites that a PR must satisfy
for merging into the target branch:" so the guidance no longer assumes `main`;
update that exact line in CONTRIBUTING.md to use "target branch" (or similar
neutral wording) wherever the literal appears.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 97583ce1-c23c-4904-a1d9-5a32747e9bb0
📒 Files selected for processing (8)
.github/workflows/conflict-check.yml.github/workflows/pre-commit.yml.github/workflows/rust.yml.github/workflows/sanitizer.ymlAGENTS.mdCLAUDE.mdCONTRIBUTING.mdREADME.md
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #778 +/- ##
==========================================
- Coverage 72.69% 72.68% -0.02%
==========================================
Files 321 321
Lines 70350 70350
==========================================
- Hits 51140 51132 -8
- Misses 19210 19218 +8
|
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Switch the development model away from per-release
vX.Y-devbranches (v0.40-dev,v0.41-dev,v0.42-dev, each going stale after its release) to a single permanentdevbranch as the default for active development, withmasterrenamed tomainto track the latest tagged release. Release branches (chore/release-vX.Y.Z) are still cut fromdevper release for the review window, then merged back.Updates the file-level references that hardcode the old model:
pre-commit,rust,sanitizer,conflict-check) now fire on pushes tomain/devinstead ofmaster/v**-dev.CLAUDE.md,AGENTS.md,CONTRIBUTING.md,README.mddescribe the new branching model and target branches.branch/mainandbranch/dev.The actual GitHub-side actions (rename
master->main, renamev0.42-dev->dev, change default branch, update branch-protection rules) are repo settings and must be performed by an admin separately. Order matters: tagv0.42.0fromv0.42-devfirst, then perform the GitHub renames, then merge this PR againstdev.To fix it up locally just run:
Summary by CodeRabbit
Release Notes
mainfor stable releases and hotfixes,devfor active feature development, replacing the previousmasterand versionedv*-devbranches.