I’m still new to git and github… well, I forked a plugin on github and made a few changes a while back. The owner added some of my changes, but github didn’t show that my changes were merged. Since that time, a few other users have forked and updated the plugin.
Today I downloaded the latest forked version (not yet merged into the master), made my changes and tried to save them to my repository. The push was rejected and I got a “non-fast-forward” updates are rejected. Merge the remote changes…”. Well then I did something really stupid – I deleted my github repository and forked the latest branch.
Now if I try to push I get the same error. I’ve reinitialized my git git init and tried to pull from the master git pull {name} master (from this SO answer) and I get a “fatal: … git-pull cannot be used without a working tree”. I’ve also tried the commands from SO answer and get the same error.
Is there anything I can do to fix this and push the lastest version?
Edit: Oops I used git pull not git remote add...
A reject with non fast forward means that your local repository is not up to date and that you will have to do a merge locally before you can push again. You have to pull first.