Hello!
I use zigbee2MQTT 1.12.0, and tried to update it to current version according instructions here.
On command “git pull” I got this:
Updating 840b9d9..7e46435
error: Your local changes to the following files would be overwritten by merg e:
.github/ISSUE_TEMPLATE.md
.gitignore
README.md
azure-pipelines.yaml
docker/Dockerfile
docker/run.sh
lib/controller.js
lib/eventBus.js
lib/extension/baseExtension.js
lib/extension/bridgeConfig.js
lib/extension/deviceAvailability.js
lib/extension/deviceBind.js
lib/extension/deviceConfigure.js
lib/extension/deviceEvent.js
lib/extension/deviceGroupMembership.js
lib/extension/deviceReport.js
lib/extension/entityPublish.js
lib/extension/groups.js
lib/extension/homeassistant.js
lib/extension/networkMap.js
lib/extension/otaUpdate.js
lib/extension/softReset.js
lib/mqtt.js
lib/state.js
lib/util/logger.js
lib/util/settings.js
lib/util/utils.js
lib/util/yaml.js
lib/zigbee.js
package.json
test/bridgeConfig.test.js
test/controller.test.js
test/deviceAvailability.test.js
test/deviceBind.test.js
test/deviceConfigure.test.js
test/deviceEvent.test.js
test/deviceReport.test.js
test/entityPublish.test.js
test/group.test.js
test/homeassistant.test.js
test/logger.test.js
test/networkMap.test.js
test/otaUpdate.test.js
test/settings.test.js
test/stub/data.js
test/stub/zigbeeHerdsman.js
Please, commit your changes or stash them before you can merge.
Aborting
My os is ubuntu 16.04.
Do somebody know, how to fix it?
Thanks!