If you are Maintaining a Custom Wiki you will eventually want to merge your changes with those from the community. Here we describe fine points of that merge.
GitHub will announce on the main page of your repo when you are simultaneously ahead and behind in changes.
This branch is 4 commits ahead, 9 commits behind fedwiki:master.
more to explain
Auto-merging package.json CONFLICT (content): Merge conflict in package.json Automatic merge failed; fix conflicts and then commit the result.
git commit -a -m 'merge with 0.7.1'
"You cannot publish over the previously published version 0.7.2." : @wardcunningham/wiki