component/*/test-py2.cfg: extend stack/slapos-py2.cfg
With buildout3 all python2 software must extend this
With buildout3 all python2 software must extend this
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/jerome/slapos.git" "fix/nxdtestpy2" git checkout -b "jerome/slapos-fix/nxdtestpy2" 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 "jerome/slapos-fix/nxdtestpy2"
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.