ensure working version of setuptools_scm
Install setuptools_scm before jsonschema (which has it in setup_requires) so that the version can be controlled by buildout
Install setuptools_scm before jsonschema (which has it in setup_requires) so that the version can be controlled by buildout
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/klaus/slapos.git" "setuptools_scm" git checkout -b "klaus/slapos-setuptools_scm" 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 "klaus/slapos-setuptools_scm"
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.