WIP: New API rebased
Contains changes from cedric/erp5@json-api
, rebased on top of romain/erp5@wip-vifib
.
Contains changes from cedric/erp5@json-api
, rebased on top of romain/erp5@wip-vifib
.
Step 1. Fetch and check out the branch for this merge request
git fetch "https://lab.nexedi.com/tsoulard/erp5.git" "fusion-monster" git checkout -b "tsoulard/erp5-fusion-monster" 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/wip-vifib" git merge --no-ff "tsoulard/erp5-fusion-monster"
Step 4. Push the result of the merge to GitLab
git push origin "wip-vifib"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.