From abfede8d5be9db98165ff20ed503f81be01db78e Mon Sep 17 00:00:00 2001 From: callahad Date: Tue, 8 Jun 2021 10:45:10 +0000 Subject: deploy: 7dc14730d925a39a885a14ce309d99054f9617d5 --- develop/dev/git.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'develop/dev/git.html') diff --git a/develop/dev/git.html b/develop/dev/git.html index 3382a32d6a..fa91d5f6a2 100644 --- a/develop/dev/git.html +++ b/develop/dev/git.html @@ -283,15 +283,15 @@ when a PR is landed, or as part of our release process.

that our active branches are ordered thus, from more-stable to less-stable:

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.)

@@ -302,7 +302,7 @@ most intuitive name. ^

[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