To git@github.com:andrew/feeddit.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to 'git@github.com:andrew/feeddit.git'
:(
Something seems to have gone horribly wrong, either on github or with the whole feeddit repository, all of my recent changes have disappeared from github and all of tom's changes have gone!
http://github.com/TomK32/feeddit/tree
I still have a local copy that is up to date tho, no idea what is going on with it!
I've sent a support email, hopefully they will get back to me with some helpful advise :)
*bet it's engine yard fault*
So I've checked back in all the changes that I made, kinda sucks that that happened, not really sure why tho