Zigbee2mqtt: Please commit your changes or stash them before you merge.

[z4rn0x]

Hello,
Trying to update to the new rev 1.3.0, I get an error when i enter "git pull"

Updating 4048cb8..00ebd44
error: Your local changes to the following files would be overwritten by merge:
.eslintrc.json
.github/ISSUE_TEMPLATE.md
index.js
lib/controller.js
lib/extension/bridgeConfig.js
lib/extension/deviceAvailability.js
lib/extension/deviceBind.js
lib/extension/deviceGroupMembership.js
lib/extension/devicePublish.js
lib/extension/deviceReceive.js
lib/extension/deviceReport.js
lib/extension/homeassistant.js
lib/extension/livolo.js
lib/extension/xiaomi.js
lib/state.js
lib/util/settings.js
lib/util/utils.js
lib/zigbee.js
test/controller.test.js
test/data.test.js
test/deviceAvailability.test.js
test/devicePublish.test.js
test/deviceReceive.test.js
test/homeassistant.test.js
test/settings.test.js
test/utils.js
Please commit your changes or stash them before you merge.
Aborting

Anything I should do?
Thanks for your help

[z4rn0x]

Googled it a bit, and I found that: https://appuals.com/how-to-fix-git-error-your-local-changes-to-the-following-files-will-be-overwritten-by-merge/
I'll give it a chance tonight when I'll be home... (Method 1)

[andreasbrett]

Please just use the update.sh script that comes with zigbee2mqtt.

https://github.com/Koenkk/zigbee2mqtt/blob/master/update.sh

[z4rn0x]

Please just use the update.sh script that comes with zigbee2mqtt.

https://github.com/Koenkk/zigbee2mqtt/blob/master/update.sh

That didn't solve my problem...
The method 1 I was referring to didn't solve it either, I got the same error, so I tried this:
git stash
git stash drop
and problem solved!
Thanks anyway