WIP: Gitlab prod
This is not a "merge request" strictly speaking, just a place to keep the current version running on lab.nexedi.com
/cc @alain.takoudjou
This is not a "merge request" strictly speaking, just a place to keep the current version running on lab.nexedi.com
/cc @alain.takoudjou
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b "gitlab-prod" "origin/gitlab-prod"
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/master" git merge --no-ff "gitlab-prod"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.