Feature Branch Merging
From Team 449 Wiki
Code is developed in separate feature branches until it is complete and ready to be merged into master branch.
When merging feature branches into master, do not straight merge the branches. Pull request the feature branch, resolve all merge conflicts, then merge the pull request into master.
This allows for clearer version history and can prevent merge conflicts.