Error while updating to latest version (2.7.1 => 2.8.6)

[pd5wl]

When ever i am lazy and wait to long i get strange errors while running update_cloudlog.sh

Today it is:

Cloudlog update started

Using /home/hamlog/domains/[somthing]/public_html as working directory
Fetching changes from remote...
Fetched latest changes successfully
Fast-forwarding to HEAD (bleeding-edge)...
Updating d348f17..bb5c869
error: Your local changes to the following files would be overwritten by merge:
assets/json/pota.txt
Please commit your changes or stash them before you merge.

The thing is i haven't manually changed anything on the server.
And i am unable to force it to update.
I know it's a bit behind. But basicly it should not matter.

Any hints on what to do when this happend.

73 de PD5WL

[magicbug]

In the folder just "git stash" and then you shouuld be able to git pull again

[pd5wl]

Fixed. Please not i also had todo the following steps:
git stash
edit index.php to set it back to production.
edit update_cloud.sh to set the correct ownership
chmod a+x update_cloudlog.sh
run update_cloudlog.sh

If i am correct this usually will fix these type problems with git? My sites are up to date again.

ThanX