Skip to content

Instantly share code, notes, and snippets.

@lukeredpath

lukeredpath/gist:c0e7d89baa6c56e6969e7b84b4dfd13b

Created July 19, 2017 16:55
Show Gist options
  • Save lukeredpath/c0e7d89baa6c56e6969e7b84b4dfd13b to your computer and use it in GitHub Desktop.
Save lukeredpath/c0e7d89baa6c56e6969e7b84b4dfd13b to your computer and use it in GitHub Desktop.
Download ZIP
Feature branching strategy
Raw
gistfile1.txt
master
|
|----feature1
| |
| |----task1
| |
| |----task2
|
|----feature2
1. Create feature branch from master
2. Create task branch from feature branch
3. Do sub-set of feature1
4. Open PR, review, merge to feature branch
5. Repeat 2-4 until feature is ready for QA
6. Open PR from feature branch to master
7. Final code review, QA
8. Make changes if necessary
9. Merge to master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment