...
Bug fix branches: When a bug is found on master, the branch for developing a fix should start from the commit that introduced the bug. This is so that any feature branch which also contains the bug can easily merge in the bug fix without having to merge in many other changes on that may have occurred while the feature branch was being developed.
Testing and Merging: When the feature branch is done, the developer performs relevant testing within the feature branch, issues a "pull request", and designates an Integrator. The Integrator conducts the code review, merges the feature branch into the "next" integration branch and tests the feature within the latest version of ACME. The integrator and developer may need to work together to resolve any issues that arise from the code review or testing in the "next" branch. The integrator will then merge merge the branch into master. Once merged to master, the branch is complete and the developer can move on to other topics.
- One feature per git branch (ideally)
- One pull request (PR) per branch (absolutely)
- Nothing gets added to "next" or "master" except by merging a branch through a PR (absolutely).