afiadam
I've spent some time looking into this and doing some testing. Would you try running the following commands whilst SSH'ed into your server as root:
(You need to replace /var/www/html
with the directory of your ITFlow instance, if not at /var/www/html).
git config --system --add safe.directory '*'
sudo chmod -R 775 /var/www/html/
-
Then navigate to your ITFlow directory (cd /var/www/html
) and run:
git reset --hard
git pull
-
You'll need to rm [file]
any files it says are conflicting ("The following untracked working tree files would be overwritten by merge") in order to allow the update, but this may potentially allow future updates to work.
Please let me know?