Adapt html5as
SR to match html5as-base
in html5as-tutorial
branch once !1057 is merged.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/xavier_thompson/slapos.git" "html5as-match-tutorial" git checkout -b "xavier_thompson/slapos-html5as-match-tutorial" 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-html5as-match-tutorial"
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.