Step by Step Merge

We've adopted a step-by-step method for merging pull requests where the order of steps depends on the complexity of the change. In the simplest form, we merge in GitHub and then double check on localhost.

On GitHub, review files changed, then merge.

On the command line, clone repo or pull changes and remove node-modules.

npm install grunt build

In a second terminal window, install current wiki.

npm install $(npm pack ../wiki-plugin-foo -1) node index.js -p 3030 -f ...

When satisfied, tag and publish.

npm version minor # or patch if appropriate git push npm publish

Can also do the merge locally if less sure that the change has been sufficiently tested by the requestor.