+ [2015-05-10T01:15:26Z] gohanman What do I do when "git fetch origin && git merge origin master" says "Already up-to-date" and "git push origin master" says rejected non-fast-forward where "origin" is github?