Merging motions

This page describes the process the Project Editor follows when merging a motion branch.

1. Open the issue and the corresponding pull request, and read any notes
2. git checkout master && git pull
3. Check out the motion branch, ensure it's up-to-date with remote if necessary
4. Rebase the branch on master, fix conflicts if necessary, and git push --force-with-lease
   • --force-with-lease will complain if the branch was not locally up to date or if it was modified by someone else in the meantime
   • Force-pushing now ensures that any edits made other than as part of rebase are visible in github
5. [Optional if the PR is small/unlikely to conflict and has been reviewed] Rebuild the working draft, check and fix any issues
   • If any issues were fixed, git push --force-with-lease
6. Check pull request description
   • Should contain "Fixes #MMMM" to close the motion issue
   • Should contain "Fixes cplusplus/papers#MMMM" to close paper tracking issues
   • Should contain "Fixes cplusplus/nbballot#MMMM" to close NB comment tracking issues
7. Merge from github
   • "Create a merge commit"
   • Summary of commit should be "Merge YYYY-MM [CL]WG Motion NN"
   • Description should list paper(s) merged

Motion branches should be merged in motion order, with no intervening commits to master.