stack/slapos.cfg: Unify version pins for slapos.recipe.template
Pin slapos.recipe.template
to version 4.5
in stack/slapos.cfg
, and remove all other version pins for this recipe.
Pin slapos.recipe.template
to version 4.5
in stack/slapos.cfg
, and remove all other version pins for this recipe.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/xavier_thompson/slapos.git" "pin_cleanup" git checkout -b "xavier_thompson/slapos-pin_cleanup" 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 "xavier_thompson/slapos-pin_cleanup"
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.
This will create a new commit in order to revert the existing changes.