This repository has been archived by the owner on Jul 14, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Git Flow
Allan Deutsch edited this page Apr 9, 2018
·
3 revisions
- Make a new branch for your feature by branching from the latest commit from branch "develop" into "feature/YOUR-FEATURE-HERE"
- Develop the feature
- Test the feature
- Merge "develop" latest back into your branch
- Pull request to merge your feature into "develop"
- Have someone who is not you code review your PR
- Merge "develop" latest back into your branch (if needed)
- Complete the PR, merging your feature branch into "develop"
- Delete your feature branch
- Verify there are no active release branches
- Specify a cutoff date and feature list for the release
- confirm date & features with the team
- checkout "develop"
- Make a new branch for the release by branching from "develop"
- Have everyone on the team validate the release for 2 weeks
- Commit any bug fixes to the release and merge them back into "develop"
- Merge the release into "master"
- delete the release branch