Zigate Plugin - git errors

[pipiche]

In case you are getting errors like that when trying to update the Zigate Plugin

Code: Select all

git pull
Auto-merging www/index.html
CONFLICT (add/add): Merge conflict in www/index.html
Auto-merging plugin.py
CONFLICT (content): Merge conflict in plugin.py
Auto-merging Tools/Fedora/pi-zigate-fedora.py
CONFLICT (add/add): Merge conflict in Tools/Fedora/pi-zigate-fedora.py
Auto-merging ReleaseNotes.md
CONFLICT (content): Merge conflict in ReleaseNotes.md
Auto-merging OTAFirmware/IKEA-TRADFRI/159700-TRADFRI-motion-sensor-1.2.214.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/159698-TRADFRI-driver-lp-1.2.217.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/159697-TRADFRI-driver-hp-1.2.217.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/159696-TRADFRI-bulb-w-1000lm-1.2.214.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/159695-TRADFRI-bulb-ws-1000lm-1.2.217.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/159495-TRADFRI-transformer-1.2.245.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/10035534-TRADFRI-bulb-ws-gu10-1.2.221.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/10035515-TRADFRI-bulb-cws-1.3.009.ota.ota.signed
Auto-merging OTAFirmware/IKEA-TRADFRI/10005777-4.1-TRADFRI-control-outlet-2.0.022.ota.ota.signed
Auto-merging Modules/zigateConsts.py
CONFLICT (add/add): Merge conflict in Modules/zigateConsts.py
Auto-merging Modules/readClusters.py
CONFLICT (content): Merge conflict in Modules/readClusters.py
Auto-merging Modules/pairingProcess.py
CONFLICT (add/add): Merge conflict in Modules/pairingProcess.py
Auto-merging Modules/legrand_netatmo.py
CONFLICT (add/add): Merge conflict in Modules/legrand_netatmo.py
Auto-merging Modules/input.py
CONFLICT (content): Merge conflict in Modules/input.py
Auto-merging Modules/heartbeat.py
CONFLICT (content): Merge conflict in Modules/heartbeat.py
Auto-merging Modules/domoticz.py
CONFLICT (content): Merge conflict in Modules/domoticz.py
Auto-merging Conf/DeviceConf.txt
CONFLICT (content): Merge conflict in Conf/DeviceConf.txt
Auto-merging Classes/OTA.py
Automatic merge failed; fix conflicts and then commit the result.

You will have to do a reinstall of the plugin. Here is the procedure to follow to not loose anything
https://github.com/pipiche38/Domoticz-Z ... install.md

[pfloryann]

Hi Pipiche,

I updated the beta plugin and i had the above erros . I followed the link steps for reinstall the plugin...all was fine but in the end i have an error. Now i using the stable because i can't change on beta. When i trying to change on beta i have this:

error: Your local changes to the following files would be overwritten by checkout:
Classes/PluginConf.py
Conf/Certified/IKEA_TRADFRI/TRADFRI wireless dimmer.json
Modules/domoticz.py
Modules/heartbeat.py
Modules/input.py
Modules/output.py
Modules/pairingProcess.py
Modules/readClusters.py
Modules/schneider_wiser.py
ReleaseNotes.md
www/1-es2015.353ada42944e3ad6b3c9.js
www/1-es5.353ada42944e3ad6b3c9.js
www/10-es2015.cd11cb80c7c2775a37e1.js
www/10-es5.cd11cb80c7c2775a37e1.js
www/11-es2015.32de84e4b0564a1f16dd.js
www/11-es5.32de84e4b0564a1f16dd.js
www/12-es2015.5fbfab36313ed12ab427.js
www/12-es5.5fbfab36313ed12ab427.js
www/3rdpartylicenses.txt
www/6-es2015.30570632f2e844aef491.js
www/6-es5.30570632f2e844aef491.js
www/7-es2015.a0d3f6fb9bcc65f6c55e.js
www/7-es5.a0d3f6fb9bcc65f6c55e.js
www/8-es2015.dab4f1b6c189d31968b3.js
www/8-es5.dab4f1b6c189d31968b3.js
www/9-es2015.53ab70203d988144ba40.js
www/9-es5.53ab70203d988144ba40.js
www/fa-brands-400.088a34f78f530102fd96.eot
www/fa-brands-400.273dc9bf9778fd37fa61.ttf
www/fa-brands-400.822d94f19fe574778652.woff2
www/fa-brands-400.d72293118cda50ec50c3.svg
www/fa-brands-400.f4920c94c0861c537f72.woff
www/fa-regular-400.3ac49cb33f43a6471f21.eot
www/fa-regular-400.9efb86976bd53e159166.woff2
www/fa-regular-400.a57bcf76c178aee452db.woff
www/fa-regular-400.d2e53334c22a9a4937bc.svg
www/fa-regular-400.ece54318791c51b52dfd.ttf
www/fa-solid-900.2aa6edf8f296a43b32df.ttf
www/fa-solid-900.7a5de9b08012e4da4050.svg
www/fa-solid-900.7fb1cdd9c3b889161216.eot
www/fa-solid-900.93f284548b42ab76fe3f.woff
www/fa-solid-900.f6121be597a72928f54e.woff2
www/index.html
www/main-es2015.1255721b88c9f50e16ae.js
www/main-es5.1255721b88c9f50e16ae.js
www/polyfills-es2015.2e0d70ba805191d1aa0d.js
www/polyfills-es5.5771b725ec36c3694c88.js
www/robots.txt
www/runtime-es2015.5ba7ce892a11ce43e949.js
www/runtime-es5.5ba7ce892a11ce43e949.js
www/styles.24cb59b78766d11a93ad.css
Please commit your changes or stash them before you switch branches.
Aborting

[pipiche]

Please follow the procedure which was given. You should not copy but move in order to start from a clean/empty situation