Skip to content

feat: introduce develop branch as integration branch#23

Merged
amcheste merged 1 commit into
mainfrom
feat/develop-branch-workflow
Mar 29, 2026
Merged

feat: introduce develop branch as integration branch#23
amcheste merged 1 commit into
mainfrom
feat/develop-branch-workflow

Conversation

@amcheste
Copy link
Copy Markdown
Owner

Summary

Establishes the develop/main branch model so main always equals the latest published release.

Branch model

Branch Purpose
main Latest release — always stable, never directly committed to
develop Integration branch — all PRs target here
feature/* etc. Short-lived branches off develop

Changes

  • validate.yml — triggers on push/PR to both develop and main
  • release-drafter.yml — tracks pushes to develop so release notes accumulate as PRs merge
  • publish-release skill — updated flow: bump version on develop → open develop→main PR → user merges → tag main → push tag → release pipeline fires
  • CONTRIBUTING.md — branch model table + updated release process section
  • CLAUDE.md — git workflow section updated to reference develop as the base branch

After merging this PR

Two manual steps to complete the setup:

  1. Create the develop branch from main:

    git checkout main && git pull
    git checkout -b develop && git push -u origin develop
  2. Set develop as the default branch (GitHub → Settings → Branches → Default branch → develop)

  3. Update branch protection:

    • develop: require PR + status checks (Lint, Formula Audit, Integration Test, Commit Lint)
    • main: require PR, no direct pushes

🤖 Generated with Claude Code

Establishes a develop/main branch model where main always equals the
latest published release and develop accumulates changes between releases.

- validate.yml: trigger on push/PR to both develop and main
- release-drafter.yml: track pushes to develop for release note accumulation
- publish-release skill: updated flow — bump on develop, open develop→main
  PR, merge, tag main, push tag to trigger release pipeline
- CONTRIBUTING.md: document branch model and updated release process
- CLAUDE.md: update git workflow section to reference develop as base branch

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@amcheste amcheste merged commit 4802cf9 into main Mar 29, 2026
6 checks passed
@amcheste amcheste deleted the feat/develop-branch-workflow branch March 29, 2026 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant