git branch flow
Out of the wide range of ways different teams use git branches, we're using a straightforward approach.
For most work, make a task-specific "feature branch" or "bugfix branch", make a series of edits and commits, merge in changes from master, then merge the result back to master, ideally using a Pull Request:
There will be many such feature branches in progress at a time.
Sometimes it makes sense to continue adding to the feature branch, but it's good to delete it when you stop working on it to reduce the number of stale branches.
A "development branch" is just a term for a feature branch that's shared by multiple developers.
A "release branch" is used to prepare and make a public release. After branching from "master", you might merge in select bug fixes. After making the release, you might cherry-pick specific bug fixes to make a bug-fix release.
