Update for caucase 0.9.2 and drop slapos.cookbook:erp5.test recipe
The motivation to drop slapos.cookbook:erp5.test recipe is to allow customizations needed to properly integrate caucase.
The motivation to drop slapos.cookbook:erp5.test recipe is to allow customizations needed to properly integrate caucase.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/gabriel/slapos.git" "caucase_integration" git checkout -b "gabriel/slapos-caucase_integration" FETCH_HEAD
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 "gabriel/slapos-caucase_integration"
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.