Updated the github-usage section to clarify what to do in the event of t...

...he master branch getting ahead of yours.