strong-remoting API doc push

gistfile1.txt

$ git commit -m "Clean up and fix API docs"
[master 4d96596] Clean up and fix API docs
 5 files changed, 108 insertions(+), 84 deletions(-)
Rands-MacBook-Air:strong-remoting rand$ git push
To https://github.com/strongloop/strong-remoting.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/strongloop/strong-remoting.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Rands-MacBook-Air:strong-remoting rand$ git pull
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (20/20), done.
remote: Total 20 (delta 8), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (20/20), done.
From https://github.com/strongloop/strong-remoting
   e76c1a7..00ee5d5  master     -> origin/master
   2dbbea5..00ee5d5  2.x-latest -> origin/2.x-latest
 + c27e6eb...ac18160 feature/readables -> origin/feature/readables  (forced update)
 * [new tag]         v2.20.0    -> v2.20.0
error: Your local changes to the following files would be overwritten by merge:
	lib/http-context.js
Please, commit your changes or stash them before you can merge.
Aborting
Rands-MacBook-Air:strong-remoting rand$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 4 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   lib/http-context.js

no changes added to commit (use "git add" and/or "git commit -a")
Rands-MacBook-Air:strong-remoting rand$ git add lib/http-context.js 
Rands-MacBook-Air:strong-remoting rand$ git commit -m "API doc fixes"
[master 8ac1dd0] API doc fixes
 1 file changed, 2 insertions(+), 1 deletion(-)
Rands-MacBook-Air:strong-remoting rand$ git push
To https://github.com/strongloop/strong-remoting.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/strongloop/strong-remoting.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Rands-MacBook-Air:strong-remoting rand$ git pull
Auto-merging lib/shared-method.js
Auto-merging lib/http-invocation.js
Auto-merging lib/http-context.js
Merge made by the 'recursive' strategy.
 CHANGES.md             |  58 ++++++++++++++++---------------
 lib/http-context.js    | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 lib/http-invocation.js |  26 +++++++++++++-
 lib/rest-adapter.js    |   8 +++--
 lib/shared-method.js   |   7 ++++
 package.json           |  18 ++++++----
 test/streams.js        | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 335 insertions(+), 41 deletions(-)
Rands-MacBook-Air:strong-remoting rand$ git status
On branch master
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)
nothing to commit, working directory clean
Rands-MacBook-Air:strong-remoting rand$ git push
Counting objects: 18, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (18/18), done.
Writing objects: 100% (18/18), 3.38 KiB | 0 bytes/s, done.
Total 18 (delta 15), reused 0 (delta 0)
To https://github.com/strongloop/strong-remoting.git
   00ee5d5..28d60b8  master -> master
Rands-MacBook-Air:strong-remoting rand$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean