Creating a new major release

These instructions are for creating a new major LAE stable release based on a new core Moodle release and the previous LAE release. They are derived in large part from Tim Hunt's excellent blog post Moving the OU Moodle code to Moodle 2.6.1

1. Clone the CLAMP repository: git clone [email protected]:CLAMP-IT/moodle.git integration38
2. Add the Moodle core repository: git remote add core https://github.com/moodle/moodle && git fetch core
3. Create a merge_helper_branch downstream of the new core release: git checkout -b merge_helper_branch v3.8.0
4. Merge the most recent past release into that branch: git merge --strategy=ours v3.7.3
5. Sanity-check: git diff v3.8.0 shouldn't return anything.
6. Checkout the corresponding LAE stable branch for the past release: git checkout LAE_37_STABLE
7. Create a new stable branch for the new release: git checkout -b LAE_38_STABLE
8. Merge the helper branch into the new stable branch: git merge --strategy-option=patience merge_helper_branch
9. Resolve merge conflicts and commit. If there are numerous merge conflicts, such as when anonymous forums conflicted with the refactored mod_forum module in 3.7.0, consider backing out the patch, re-rerunning this process, and rebuilding the patch from scratch.
10. Verify the merge against the new release: git diff v3.8.0 --stat
11. Create a new package branch downstream of the new stable branch: git checkout -b LAE_38_PACKAGE LAE_38_STABLE
12. Manually add the LAE packages by following the instructions here: https://github.com/CLAMP-IT/moodle/wiki/Integration-Procedures#adding-a-new-module-to-a-package-branch