Commit 71a76f51 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'release-branch-earlier' into 'master'

Release branch earlier

Fixes #1603

See merge request !1102
parents 90173628 4bf3abe2
......@@ -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
```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment