Sorting Issues

Out of sync upstream

Accidental update is files on the imagineftp will result in failed pushes. To bring them inline again:

ssh into imagineftp and then cd to the dir with the repo in.
 git checkout -f origin/master

then
merge origin/master

then don’t do it again. 🙂

Fixing manual FTP updates on live:

SSH into live. cd into the working directory. eg www/howitworks

git fetch –all

git reset –hard origin/master

This will assume that Github has the version you wish to make live, any changes made via FTP not within version control on Github will be deleted .