Hubzilla 4.6 update causes an error
Updating with util/udall
causes in an error in core and addon.
git reset HEAD --hard
worked in root (similar error message) but in addon in doesn't:
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
4038b783..59984458 dev -> origin/dev
Already up to date.
Updating hzaddons
Updating e3046c61..c84f163f
error: Your local changes to the following files would be overwritten by merge:
channelreputation/channelreputation.php ljpost/ljpost.apd morepokes/lang/it/messages.po openstreetmap/openstreetmap.php twitter/twitter.php wppost/wppost.php
Please commit your changes or stash them before you merge.
Aborting
I didn't change anything.