diff options
author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-09-19 16:00:44 +0000 |
---|---|---|
committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-09-19 16:00:44 +0000 |
commit | 71a76f5162806cfe6654a9037ab004f82ec279af (patch) | |
tree | 2fddd9c24c30fa66923ae1b437037e29873624d5 | |
parent | 9017362889e7018e180a86e2747703e8bc34fbc2 (diff) | |
parent | 4bf3abe2b80b5f620ce588728194d6ce4f6779ef (diff) | |
download | gitlab-ce-71a76f5162806cfe6654a9037ab004f82ec279af.tar.gz |
Merge branch 'release-branch-earlier' into 'master'
Release branch earlier
Fixes #1603
See merge request !1102
-rw-r--r-- | doc/release/monthly.md | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 2c26a90589d..92c01c5d945 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -149,6 +149,23 @@ Create an annotated tag that points to the version change commit: git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1' ``` +### **6. Create stable branches** + +For GitLab EE, append `-ee` to the branch. + +`x-x-stable-ee` + +``` +git checkout master +git pull +git checkout -b x-x-stable +git push <remote> x-x-stable +``` + +Now developers can use master for merging new features. +So you should use stable branch for future code chages related to release. + + # **18th - Release RC1** ### **1. Update GitLab.com** @@ -222,11 +239,9 @@ Note: Merge CE into EE if needed. - Change the VERSION file in `master` branch of the CE repository and commit and push. - Change the VERSION file in `master` branch of the EE repository and commit and push. -### **2. Create x-x-stable branch and push to the repositories** +### **2. Push latest changes from x-x-stable branch to the repositories** ``` -git checkout master -git pull git checkout -b x-x-stable git push <remote> x-x-stable ``` |