2 commits

Author	SHA1	Message	Date
Dan Callahan	7dc14730d9	Name release branches just after major.minor (#10013) ... With the prior format, 1.33.0 / 1.33.1 / 1.33.2 got separate branches: release-v1.33.0 release-v1.33.1 release-v1.33.2 Under the new model, all three would share a common branch: release-v1.33 As before, RCs and actual releases exist as tags on these branches. This better reflects our support model, e.g., that the "1.33" series had a formal release followed by two patches / updates. Signed-off-by: Dan Callahan <danc@element.io>	2021-06-08 11:44:50 +01:00
Richard van der Hoff	66d03639dc	Notes on using git (#7496) ... * general updates to CONTRIBUTING.md * notes on updating your PR * Notes on squash-merging or otherwise * document git branching model	2020-05-14 18:03:10 +01:00