How to set up GitFlow workflow

· Category: Git

Short answer

GitFlow uses main, develop, feature/*, release/*, and hotfix/* branches to organize development and releases.

Steps

  1. Install the GitFlow extension or use standard Git commands.
  2. Initialize GitFlow:
git flow init
  1. Start a feature:
git flow feature start login-page
  1. Finish a feature:
git flow feature finish login-page
  1. Start and finish a release:
git flow release start 1.2.0
git flow release finish 1.2.0

Tips

  • Keep main always production-ready.
  • Merge release branches into both main and develop.
  • Use hotfix branches for urgent production fixes.

Common issues

  • Merge conflicts during release finishing: resolve before tagging.
  • Forgetting to merge back into develop causes drift from main.