[Step 13][Workflow] Git flow - Yellow-Team-Millerslab/GitPlayground GitHub Wiki

Ref

1. Always have Develop and Master Branches. (Project admin should set develop branch as default branch)

2. Feature Branches, it only interacts with Develop branch. It is like Github flow, but interacting with the Develop branch.

• Create a branch.
• Make some changes and commit.
• Merge the latest code from develop branch and create a pull request.
• Project admin merge the pull request
• Project admin create a release branch from develop branch. (This branch is only for bug fix)
• When it is ready to release, Project admin merge release branch into master branch and tag it.
• Project admin merge release branch back to develop branch

Release Branch:

3. Handling Hotfix. (In Github flow it is just another branch)

   • Create a branch from master. (Only Hotfix can branch from master)
   • Make some changes and create a pull request.
   • Project admin merge it back to master and develop branch (or the current release branch)

Here is the testing repo for this workflow GitPlayGround-Git-Flow

Use Git Flow with SourceTree