From abfede8d5be9db98165ff20ed503f81be01db78e Mon Sep 17 00:00:00 2001
From: callahad
master
(tracks our last release).release-vX.Y.Z
(the branch where we prepare the next release)release-vX.Y
(the branch where we prepare the next release)3.develop
(our "mainline" branch containing our bleeding-edge).The corollary is: if you have a bugfix that needs to land in both
-release-vX.Y.Z
and develop
, then you should base your PR on
-release-vX.Y.Z
, get it merged there, and then merge from release-vX.Y.Z
to
+release-vX.Y
and develop
, then you should base your PR on
+release-vX.Y
, get it merged there, and then merge from release-vX.Y
to
develop
. (If a fix lands in develop
and we later need it in a
release-branch, we can of course cherry-pick it, but landing it in the release
branch first helps reduce the chance of annoying conflicts.)
[2]: Well, anyone with commit access.^
[3]: Very, very occasionally (I think this has happened once in
the history of Synapse), we've had two releases in flight at once. Obviously,
-release-v1.2.3
is more-stable than release-v1.3.0
. ^
release-v1.2
is more-stable than release-v1.3
. ^
--
cgit 1.5.1