Document our branching strategy in more detail
Our branching strategy is documented, but it could be done better. In particular, it doesn't give very clear instructions about how to merge forward fixes, or how to know which branches should contain a fix. We need to document:
- No version's -dev branch should be merged to another versions -testing branch (I think this happens often currently). I.e., 2.4-dev should not ever be merged into 2.5-testing.
- If a PR needs to be merged to more than one -testing branch, it should be merged to each directly as opposed to merging to 2.4-testing --> 2.4-dev --> 2.5-testing (ooops!)
- How can we use Redmine (potentially with custom fields) to help us keep track of this?
It is also worth considering whether we can automate any of this.