Git Flow Strategy

When to Use

• Deciding which branch to base work on.
• Creating a new Release or Hotfix.
• Merging strategies (Squash vs Merge Commit).

1. Branching Model

2. Feature Development

1. Start: Update develop and branch off.

   git checkout develop && git pull origin develop
   git checkout -b feature/my-feature
   

2. Work: Commit changes. Use github skill templates for PRs.
3. Finish: PR into develop. Squash merge recommended.

3. Release Process

1. Start: Branch off develop when features are frozen.

   git checkout develop
   git checkout -b release/v1.2.0
   

2. Work: Bump versions, update changelogs, fix bugs. NO NEW FEATURES.
3. Finish:
   • Merge into main (Tag this commit).
   • Merge into develop (Back-propagate fixes).
   • Delete release/v1.2.0 branch.

4. Hotfixes

1. Start: Branch off main (Production).

   git checkout main
   git checkout -b hotfix/critical-bug
   

2. Work: Fix the critical bug. Minimal changes.
3. Finish:
   • Merge into main (Tag this commit).
   • Merge into develop.
   • Delete hotfix branch.

5. Protocols

• Never commit directly to main or develop.
• Keep history clean. Use interactive rebase before PRs.
• Tags are immutable. Once pushed, do not change.