From 4bf3abe2b80b5f620ce588728194d6ce4f6779ef Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 19 Sep 2014 15:44:21 +0000 Subject: Create stable branch at 17th --- doc/release/monthly.md | 21 ++++++++++++++++++--- 1 file 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 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 x-x-stable ``` -- cgit v1.2.1