Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

A practical guide to consistent branching strategies and naming across UnifiedBits projects.

NotificationsYou must be signed in to change notification settings

unifiedbits/branching-guidelines

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

2 Commits
 
 

Repository files navigation

To ensure a clean, scalable, and team-friendly development workflow, UnifiedBits follows a consistent branching strategy using base and working branches.


🔀 Core Branches

main

  • 🔒Production-ready branch
  • Always contains the lateststable release
  • Direct changes are restricted; merged only through pull requests (usually fromdev)

dev ordevelop

  • 🚧Primary development branch
  • All new features and fixes are merged intodev first
  • Acts as a staging area before pushing to production (main)
  • Frequently rebased or updated frommain to stay in sync

🧪 Feature & Support Branches

Branch TypePurposeExample
feature/For adding new featuresfeature/api-user-dashboard
fix/For bug fixesfix/ui-navbar-overlap
refactor/For internal refactoring (no behavior change)refactor/core-cleanup
docs/For documentation updatesdocs/readme-api-guide
test/For adding or modifying teststest/auth-unit-tests
chore/For setup/config/CI/CD workchore/ci-add-lint-check
hotfix/ (optional)For urgent fixes to production (main)hotfix/api-token-expiry

🌱 Branch Naming Convention

Always follow this structure when naming your branches:

<branch-type>/<domain>-<short-description>

Use lowercase letters and hyphens for readability.

✅ Examples

feature/auth-add-otp-loginfix/ui-fix-navbar-overlaprefactor/api-cleanup-old-endpointsdocs/readme-update-api-usagetest/dashboard-add-user-metrics-tests

🧩 Common Domains

DomainDescription
authAuthentication logic
uiUser interface
apiBackend endpoints
dashboardAnalytics & reporting
coreBusiness logic
readmeProject documentation
ciContinuous Integration/Deployment
infraInfrastructure & DevOps

⚙️ Workflow Overview

🛑Always create your branch from the latestdev branch to ensure you're working with the most recent code.

  1. Checkout and pull the latestdev:

    git checkout devgit pull origin dev
  2. Create your new branch fromdev:

    git checkout -b feature/ui-add-sidebar
  3. Work on your feature/fix and commit usingConventional Commits:

    feat(ui): add collapsible sidebar component
  4. Push your branch:

    git push origin feature/ui-add-sidebar
  5. Open a Pull Request todev for review.

  6. ✅ Once reviewed and tested, maintainers will mergedev intomain when ready for production.


🧼 Maintenance Tips

  • Syncdev regularly withmain
  • Delete local and remote feature branches after merge
  • Never commit directly tomain ordev unless it's critical (viahotfix/)

🧠 Summary

BranchPurpose
mainStable production-ready code
devIntegration of features & fixes
feature/New enhancements & modules
fix/Bug fixes
hotfix/Emergency production fixes
docs/Documentation-only changes
test/Testing logic
chore/Meta tasks & setup

📚 Resources


“Organized branches mean faster development and cleaner launches.” — UnifiedBits

Let’s branch smartly and build boldly! 🚀

About

A practical guide to consistent branching strategies and naming across UnifiedBits projects.

Topics

Resources

Stars

Watchers

Forks


[8]ページ先頭

©2009-2025 Movatter.jp