Pre-merge checklist:
- Fetch the latest changes for the branch being reviewed
- Ensure that you are working in a clean branch
- e.g Clean the repository:
git clean -dix
- e.g Clean the repository:
npm install- Check that code passes linting:
grunt lint - Run the Node tests:
node tests/node-tests/basic-node-tests.js - Run the browser-based tests in supported browsers:
tests/all-tests.html - Run through any demos, examples, or manual tests that may have been affected by the change
Making the merge:
$ git checkout master
$ git merge upstream/master
$ git merge --no-ff --log <branchname>
$ git push upstream master