error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
Now I'm not sure when I did this but it looks like a managed to do a sudo git pull instead although now it doesn't work. But doing a ls -l showed a lot of my folders where owned by root not allowing me to git pull anything. To resolve this and once again if you think this is wrong or have a better option please comment below. But in the root of my website /forge/default/ I entered:
sudo chown -R forge:forge *
and now everything is owned by forge again and can be written to.