You are on page 1of 1

GIT FLOW Feature Branches

Each new feature should reside in its own branch, which can be pushed to the central repository for
backup/collaboration. But, instead of branching off of Production/Live, feature branches use develop as their parent
branch. When a feature is complete, it gets merged into development. Features should never interact directly with
Production/Live.

Note that feature branches combined with the development branch is, for all intents and purposes, the Feature
Branch Workflow. But, the Git flow Workflow doesn’t stop there.
Feature branches are generally created off to the latest beta branch.

Creating a feature branch Pass user acceptance testing


git checkout beta (UAT)
git checkout -b feature_branch git checkout production/live
git merge feature_branch
Finishing a feature branch
git checkout development Hot Fix
git merge feature_branch git checkout production/live
git checkout -b hotfix _branch
Pass internal testing (SIT)
git checkout beta git merge hotfix_branch

git merge feature_branch git checkout development


git merge hotfix _branch

You might also like