SciNote Release Merging

This document explains how upstream releases are merged into USEPA's copy of SciNote.

1. Make sure you have the latest EPA codebase with a git pull
2. Add the upstream repo if necessary: git remote add upstream git@github.com:scinote-eln/scinote-web.git
3. Fetch the upstream: git fetch upstream or fetch tags, not sure, will review git fetch --tags --all --prune
4. Create a branch that points at the most recent release from upstream: git checkout tags/1.31.0.1 -b upstream_release_1.31.0.1. Make sure you reference the correct (most recent) version tag.
5. Checkout the EPA master branch again: git fetch origin then git checkout origin/master
6. Create a merge branch: git checkout -b usepa_merge_1.31.0.1
7. Start the merge: git merge upstream_release_1.31.0.1
8. Use VS Code to fix merge conflicts.
9. Push the merged branch to remote.
10. Test locally.
11. Test on staging.
12. Merge into master.
13. Publish to production.