Updating Cloudlog with git pull --no-ff

[tcowan]

For the first time in at least 6 attempts, I have successfully updated Cloudlog with this sequence of commands:

1. (export my entire log to an ADIF file just in case)
2. (copy the entire /var/www/html folder to back up the system. The backup dialog always fails for me)
3. git pull --no-ff
4. (copy the application/config/cloudlog.php file from the backup into production)

The script update_cloudlog.sh fails 100% of the time for me, issuing some sort of error containing the words "fast-forward failed". So I tried this method.

Is this is a recommended way to do upgrades? This is the only process I have used that worked.