Moko Consulting

Open-source software for Joomla, Gitea, and web platforms. Home of MokoSuite, MokoGitea, and MokoCLI.

Tennessee
https://mokoconsulting.tech
Repositories
58
 Projects Packages Code Wiki Members
1
Repositories
58
 Projects Packages Code Wiki Members
1
standards/Branch-Policy.-

Branch Policy

Branch Model

Branch Purpose Merges From Merges To
main Production-ready stable rc, fix/* —
rc Release candidate testing dev main
dev Active development feature branches rc
feature/* New features dev dev
fix/* Bug fixes main main

Rules

  • Feature branches branch from dev, PR back to dev
  • Fix branches branch from main, PR back to main
  • Never force-merge to main — CI checks must pass before merging
  • Always PR review before merge — check compile errors, API patterns, imports
  • Protected branches (main, rc, dev) require PR + CI pass
  • Delete branches after merge

PR Workflow

  1. Create feature/fix branch
  2. Push commits
  3. Open PR to target branch
  4. Update CHANGELOG.md
  5. PR review (check for compile errors, correct API patterns, import ordering)
  6. Merge (after CI passes)

CI Push Pattern

For pushing to protected branches from CI workflows:

  1. Create a temporary branch
  2. Push changes to temporary branch
  3. Create PR from temporary branch to target
  4. Merge PR via API
  5. Delete temporary branch

Revision History

Date Author Changes
2026-06-21 jmiller Initial consolidation; resolved dev/{desc} vs feature/* contradiction
Pages