If you run Advanced -> Upgrade -> Source or when using git pull.
Browser Symptoms
You may see this just after running a git pull from /var/www/fusionpbx
cp -R /var/www/fusionpbx /var/www/fusionpbx-20200327
cd /var/www/fusionpbx
git fetch origin
git reset --hard origin/master
git pull
chown -R www-data:www-data /var/www/fusionpbx
WARNING: This will work for most people. Un-tracked files should be safe. However if you manage your own customization's for files tracked by Git you will likely need to do more to fix this issue.
Browser Symptoms
- The code will error and you will see a blank page
- The merge conflict breaks the syntax and result is the blank page.
You may see this just after running a git pull from /var/www/fusionpbx
- CONFLICT (content): Merge conflict
cp -R /var/www/fusionpbx /var/www/fusionpbx-20200327
cd /var/www/fusionpbx
git fetch origin
git reset --hard origin/master
git pull
chown -R www-data:www-data /var/www/fusionpbx
WARNING: This will work for most people. Un-tracked files should be safe. However if you manage your own customization's for files tracked by Git you will likely need to do more to fix this issue.
Last edited: