nexedi / slapos.package

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/luke/slapos.package.git feature/diff-playbook-mktemp
git checkout -b luke/slapos.package-feature/diff-playbook-mktemp FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff luke/slapos.package-feature/diff-playbook-mktemp

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.