gistfile1.txt

$ git pull [email protected]:cd34/apex.git master
From github.com:cd34/apex
 * branch            master     -> FETCH_HEAD
Already up-to-date.
(pyr27)daviesinc@pch1:/var/www/apex/apex$ git status
# On branch new_identification_method_conglomeration_to_support_multiple_auth_ids_with_single_id_for_federated_logins_and_potential_openid_endpoint
nothing to commit (working directory clean)
(pyr27)daviesinc@pch1:/var/www/apex/apex$ git push
To [email protected]:cd34/apex.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:cd34/apex.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.