Skip to content
Snippets Groups Projects
Commit 514b84f5 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Use merge instead of cherry-pick.

parent 26c8c275
No related branches found
No related tags found
No related merge requests found
......@@ -39,7 +39,7 @@
git push origin 6-6-stable 6.6.0.omnibus
```
- Make sure that the master branch has the latest CE stable tag
- Make sure that the master branch of omnibus-gitlab has the latest changes from the omnibus-gitlab CE stable branch
```shell
git checkout master
......@@ -43,7 +43,7 @@
```shell
git checkout master
git cherry-pick $(git rev-parse 6-6-stable)
git merge 6-6-stable
```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment