Support both Zope2 and Zope4
Like erp5!1735 (closed), provide Zope2 based ERP5 software release in the same branch, that will be useful during transitional period.
No effort to share configuration between Zope2 and Zope4.
Like erp5!1735 (closed), provide Zope2 based ERP5 software release in the same branch, that will be useful during transitional period.
No effort to share configuration between Zope2 and Zope4.
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b "zope2zope4py2" "origin/zope2zope4py2"
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "origin/zope4py2" git merge --no-ff "zope2zope4py2"
Step 4. Push the result of the merge to GitLab
git push origin "zope4py2"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.