Development vs Main Branches
- Develop in your local branch.
- Create one branch for each issuse, so you can merge that branch independently from your other work when that issue has been approved.
- Merge your local branch into the main branch at least once a week.
- Once merge your local branch, make sure you delete your merged branch
- Maintain only one local development branch.
Git Issues Label Flow
1. Engineer Finishes Features
- Engineer self-test feature you implemented.
- Engineer paste demo URL link in git issue comment for manager to test.
- Engineer set git issue to
Ready to Review
.
2. Manager Reviews Feature
- Manager test feature engineer implemented.
- Manager equest changes in git issue comment.
- Manager will set git issue to
Make Change
.
3. Engineer Makes Changes
- Engineer make changes requested by manager.
- Engineer get git issue to
Ready to Review
.
4. Manager Reviews Changes
- Manager test fixes.
- Manager will set git issues to
Ready to Merge
.
5. Engineer Merges Changes to Master
- Engineer merge changes to master branch.
- Engineer deploy changes to master deployment.
- Engineer closes git issue.