Problem upgrading from the command line.

Hello we seem to be experiencing a problem with the current update.

To my knowledge I have not modified the update_cli.php script but git thinks I did.

sudo -u www-data php update_cli.php

From https://github.com/itflow-org/itflow

0390b1bc..595c4f14 master -> origin/master

090f4cb5..91a523dc develop -> origin/develop

* [new branch] fix-assign2 -> origin/fix-assign2

* [new branch] fix-bulk-assign -> origin/fix-bulk-assign

* [new branch] user-activity -> origin/user-activity

error: Your local changes to the following files would be overwritten by merge:

scripts/update_cli.php

Please commit your changes or stash them before you merge.

Aborting

Updating ff80a3db..595c4f14

Update successful

Any guidance on this issue is greatly appreciated.

You could do a git reset --hard

And then try the file update again

It worked!

In the end I ran:

sudo -u www-data git reset --hard

sudo -u www-data /usr/bin/php update_cli.php

And then ran this MANY time to update the DB

sudo -u www-data /usr/bin/php update_cli.php --update_db

Thanks Again!