How to update domoticz when built from source

[toreandre]

I buildt the domoticz from source (beta) with the tellstick support.
How should i update? Is it ok to use the "update now" button in the webinterface or do i need to use the "git pull" and "make"?

[Eduard]

I buildt the domoticz from source (beta) with the tellstick support.
How should i update? Is it ok to use the "update now" button in the webinterface or do i need to use the "git pull" and "make"?

The latter, git pull & make

[toreandre]

Any ideas how to solve this one:

Code: Select all

Automatic merge failed; fix conflicts and then commit the result.

Code: Select all

osmc@osmc:~/dev-domoticz$ git pull
remote: Counting objects: 3089, done.
remote: Total 3089 (delta 1543), reused 1543 (delta 1543), pack-reused 1546
Receiving objects: 100% (3089/3089), 5.61 MiB | 1.24 MiB/s, done.
Resolving deltas: 100% (2223/2223), completed with 629 local objects.
From https://github.com/domoticz/domoticz
 + 3ffdcac...e7ce499 master     -> origin/master  (forced update)
   0bc039d..c9ff8cb  Websockets-refactored -> origin/Websockets-refactored
 * [new branch]      dnpwwo     -> origin/dnpwwo

*** Please tell me who you are.

Run

  git config --global user.email "[email protected]"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for <osmc@osmc.(none)>) not allowed
osmc@osmc:~/dev-domoticz$ git config --global user.email [email protected]
osmc@osmc:~/dev-domoticz$ git config --global user.name Tore Andre
osmc@osmc:~/dev-domoticz$ git pull
Auto-merging push/Push.h
Auto-merging push/Push.cpp
Auto-merging push/HttpPush.h
Auto-merging push/HttpPush.cpp
Auto-merging push/DataPush.h
Auto-merging push/DataPush.cpp
Auto-merging hardware/SBFSpot.h
CONFLICT (content): Merge conflict in hardware/SBFSpot.h
Auto-merging hardware/SBFSpot.cpp
CONFLICT (content): Merge conflict in hardware/SBFSpot.cpp
Auto-merging hardware/OpenZWave.cpp
CONFLICT (content): Merge conflict in hardware/OpenZWave.cpp
Removing Config/zwave.me/ZME_05461.xml
Auto-merging Config/thermofloor/heatit021.xml
Removing Config/sensative/strips-mazw.xml
Auto-merging Config/qubino/ZMNHSDx.xml
Removing Config/qubino/ZMNHOD1.xml
Removing Config/qubino/ZMNHND1.xml
Removing Config/qubino/ZMNHLD1.xml
Removing Config/qubino/ZMNHID1.xml
Auto-merging Config/qubino/ZMNHDDx.xml
Removing Config/qubino/ZMNHCD1.xml
Removing Config/qubino/ZMNHCD.xml
Auto-merging Config/qubino/ZMNHBDx.xml
Removing Config/qubino/ZMNHBD1.xml
Removing Config/qubino/ZMNHAD1.xml
Removing Config/popp/POPE009105.xml
Removing Config/popp/POP009303.xml
Auto-merging Config/popp/009105.xml
Removing Config/eneco/ed20.xml
Auto-merging Config/aeotec/zw112.xml
Auto-merging Config/aeotec/zw100.xml
Auto-merging Config/aeotec/zw099.xml
Auto-merging Config/aeotec/zw098.xml
Auto-merging Config/aeotec/zw096.xml
Auto-merging Config/aeotec/zw090.xml
Auto-merging Config/aeotec/zw089.xml
Auto-merging Config/aeotec/zw088.xml
Auto-merging Config/aeotec/zw080.xml
Auto-merging Config/aeotec/zw075.xml
Auto-merging Config/aeotec/zw074.xml
Auto-merging Config/aeotec/zw056.xml
Auto-merging Config/aeotec/dsc19103.xml
Auto-merging Config/aeotec/dsc18103.xml
Auto-merging Config/aeotec/dsc10.xml
Auto-merging Config/aeotec/dsb54.xml
Auto-merging Config/aeotec/dsb45.xml
Auto-merging Config/aeotec/dsb28.xml
Auto-merging Config/aeotec/dsb09104.xml
Auto-merging Config/aeotec/dsb05.xml
Auto-merging Config/aeotec/dsb04100.xml
Auto-merging Config/aeotec/dsa38.xml
Auto-merging Config/aeotec/dsa22.xml
Auto-merging Config/aeotec/dsa03202.xml
Removing Config/aeotec/drycontactsensor.xml
Automatic merge failed; fix conflicts and then commit the result.
osmc@osmc:~/dev-domoticz$ git pull
A       .gitattributes
M       .gitignore
M       CMakeLists.txt
M       Config/2gig/ct100.xml
M       Config/2gig/ct101.xml
M       Config/2gig/ct30.xml
A       Config/2gig/ct50e.xml
M       Config/BeNext/1poleswitch.xml
M       Config/BeNext/2poleswitch.xml
M       Config/BeNext/AlarmSound.xml
M       Config/BeNext/BuiltinDimmer.xml
M       Config/BeNext/DoorSensor.xml
M       Config/BeNext/EnergySwitch.xml
M       Config/BeNext/HeatingControl.xml
M       Config/BeNext/Molite.xml
A       Config/BeNext/PanicButton.xml
M       Config/BeNext/PluginDimmer.xml
M       Config/BeNext/SceneController.xml
M       Config/BeNext/TagReader.xml
M       Config/act/lfm20.xml
M       Config/act/zdm230.xml
M       Config/act/zdw103.xml
M       Config/act/zdw232.xml
M       Config/act/zir010.xml
M       Config/act/zrp110.xml
M       Config/act/zrw103.xml
D       Config/aeotec/alms.xml
D       Config/aeotec/doorbell_gen5.xml
D       Config/aeotec/doorwindow.xml
D       Config/aeotec/drycontactsensor.xml
A       Config/aeotec/dsa03202.xml
A       Config/aeotec/dsa22.xml
A       Config/aeotec/dsa38.xml
A       Config/aeotec/dsb04100.xml
A       Config/aeotec/dsb05.xml
A       Config/aeotec/dsb09104.xml
A       Config/aeotec/dsb28.xml
A       Config/aeotec/dsb29.xml
A       Config/aeotec/dsb45.xml
A       Config/aeotec/dsb54.xml
A       Config/aeotec/dsc06106.xml
A       Config/aeotec/dsc08101.xml
A       Config/aeotec/dsc10.xml
A       Config/aeotec/dsc11.xml
A       Config/aeotec/dsc12104.xml
A       Config/aeotec/dsc13104.xml
A       Config/aeotec/dsc14104.xml
A       Config/aeotec/dsc18103.xml
A       Config/aeotec/dsc19103.xml
A       Config/aeotec/dsc24.xml
A       Config/aeotec/dsc26103.xml
A       Config/aeotec/dsc27103.xml
A       Config/aeotec/dsc35103.xml
D       Config/aeotec/dsd31.xml
A       Config/aeotec/dsd37.xml
D       Config/aeotec/dws6.xml
D       Config/aeotec/hdss_gen5.xml
D       Config/aeotec/hem.xml
D       Config/aeotec/hemg2.xml
D       Config/aeotec/keyfob.xml
D       Config/aeotec/keyfob2.xml
D       Config/aeotec/ledbulb.xml
D       Config/aeotec/minimote.xml
D       Config/aeotec/msesv2.xml
D       Config/aeotec/multisensor6.xml
D       Config/aeotec/multisensor_gen5.xml
D       Config/aeotec/panicbtn.xml
D       Config/aeotec/recessed_doorsensor.xml
D       Config/aeotec/recessed_doorsensor_gen5.xml
D       Config/aeotec/sd6.xml
D       Config/aeotec/ses.xml
D       Config/aeotec/ses2.xml
D       Config/aeotec/ss6.xml
D       Config/aeotec/watersensor.xml
D       Config/aeotec/zstickgen5.xml
A       Config/aeotec/zw056.xml
A       Config/aeotec/zw062.xml
A       Config/aeotec/zw074.xml
A       Config/aeotec/zw075.xml
A       Config/aeotec/zw078.xml
A       Config/aeotec/zw079.xml
A       Config/aeotec/zw080.xml
A       Config/aeotec/zw088.xml
A       Config/aeotec/zw089.xml
A       Config/aeotec/zw090.xml
A       Config/aeotec/zw095.xml
A       Config/aeotec/zw096.xml
A       Config/aeotec/zw098.xml
A       Config/aeotec/zw099.xml
A       Config/aeotec/zw100.xml
A       Config/aeotec/zw112.xml
A       Config/aeotec/zw120.xml
M       Config/assa_abloy/RealLivingCapTouch.xml
M       Config/cooper/RF9505-T.xml
M       Config/cooper/RF9540-N.xml
M       Config/danfoss/living.xml
A       Config/danfoss/rsroom.xml
M       Config/danfoss/z.xml
M       Config/device_classes.xml
M       Config/device_classes.xsd
M       Config/device_configuration.xsd
A       Config/devolo/mt02648.xml
M       Config/dlink/dch-z120.xml
M       Config/dlink/dch-z510.xml
A       Config/domitech/zb22uk.xml
A       Config/domitech/ze27eu.xml
M       Config/dragontech/wd-100.xml
A       Config/duwi/05458.xml
M       Config/duwi/ZWES1000.xml
M       Config/duwi/ZWESJ300.xml
A       Config/duwi/zwfb.xml
A       Config/electronicsolutions/dbmz.xml
D       Config/eneco/ed20.xml
M       Config/enerwave/zw15s.xml
A       Config/enerwave/zw20rm.xml
M       Config/enerwave/zw500d.xml
A       Config/enerwave/zwn-bpc.xml
M       Config/eurotronic/eur_stellaz.xml
M       Config/everspring/ad147.xml
M       Config/everspring/an145.xml
M       Config/everspring/an158.xml
A       Config/everspring/an181.xml
A       Config/everspring/hac01.xml
M       Config/everspring/se812.xml
M       Config/everspring/sf812.xml
M       Config/everspring/sm103.xml
M       Config/everspring/sp103.xml
M       Config/everspring/sp814.xml
M       Config/everspring/st814.xml
M       Config/everspring/st815.xml
M       Config/everspring/tse03.xml
M       Config/everspringct/hsm02.xml
M       Config/evolve/lrm-as.xml
M       Config/evolve/lsm-15.xml
M       Config/evolve/ltm-5.xml
A       Config/fakro/zws12.xml
A       Config/fakro/zws230.xml
M       Config/fibaro/fgbs001.xml
M       Config/fibaro/fgd211.xml
M       Config/fibaro/fgd212.xml
M       Config/fibaro/fgfs101.xml
A       Config/fibaro/fgfs101zw5.xml
A       Config/fibaro/fggc001.xml
M       Config/fibaro/fgk001.xml
M       Config/fibaro/fgms.xml
M       Config/fibaro/fgr221.xml
A       Config/fibaro/fgr222.xml
M       Config/fibaro/fgrgbwm441.xml
M       Config/fibaro/fgrm222.xml
M       Config/fibaro/fgs211.xml
M       Config/fibaro/fgs212.xml
M       Config/fibaro/fgs221.xml
M       Config/fibaro/fgs222.xml
M       Config/fibaro/fgsd002.xml
M       Config/fibaro/fgss101.xml
M       Config/fibaro/fgwpe.xml
M       Config/fortrezz/mimolite.xml
A       Config/fortrezz/ssa2.xml
A       Config/fortrezz/ssa3.xml
M       Config/frostdale/fdn2nxx.xml
A       Config/ge/12724-dimmer.xml
M       Config/ge/dimmer.xml
M       Config/ge/dimmer_module.xml
M       Config/ge/relay.xml
M       Config/greenwave/powernode1.xml
M       Config/greenwave/powernode6.xml
M       Config/homeseer/ezmotionplus.xml
M       Config/homeseer/hsm100.xml
M       Config/homeseer/hsm200.xml
M       Config/homeseer/ztroller.xml
M       Config/honeywell/th8320zw1000.xml
A       Config/horstmann/asrzw.xml
M       Config/horstmann/hrt4zw.xml
M       Config/horstmann/scsc17.xml
A       Config/horstmann/ses302.xml
A       Config/horstmann/ses303.xml
A       Config/horstmann/sir321.xml
A       Config/horstmann/srt323.xml
M       Config/intermatic/ca8900.xml
M       Config/iris/rangeextender.xml
A       Config/kwikset/smartcode.xml
M       Config/leviton/rzi10.xml
M       Config/leviton/vrcpg.xml
M       Config/leviton/vrf01.xml
M       Config/leviton/vri06.xml
M       Config/leviton/vri10.xml
M       Config/manufacturer_specific.xml
M       Config/manufacturer_specific.xsd
M       Config/mcohome/mhs311.xml
M       Config/mcohome/mhs312.xml
M       Config/mcohome/mhs314.xml
M       Config/mcohome/mhs411.xml
M       Config/mcohome/mhs412.xml
M       Config/mcohome/mhs513.xml
M       Config/merten/507801.xml
M       Config/merten/50x5xx.xml
A       Config/nexia/db100z.xml
M       Config/nodon/asp3100SmartPlug.xml
A       Config/nodon/crc360xSofremote.xml
M       Config/northq/nq9121.xml
M       Config/northq/nq92021.xml
M       Config/options.xml
M       Config/options.xsd
A       Config/philio/pan03.xml
M       Config/philio/pan04.xml
M       Config/philio/pan08.xml
A       Config/philio/phpat02.xml
A       Config/philio/phpsg01.xml
A       Config/philio/pse02.xml
M       Config/philio/psm02.xml
A       Config/philio/psr04.xml
M       Config/philio/pst02-1c.xml
M       Config/philio/pst02-b.xml
M       Config/philio/pst02.xml
M       Config/polycontrol/doorlock.xml
M       Config/polycontrol/keypad.xml
A       Config/popp/009105.xml
A       Config/popp/009303.xml
M       Config/popp/123580.xml
M       Config/popp/123601.xml
M       Config/popp/123658.xml
D       Config/popp/POP009303.xml
D       Config/popp/POPE009105.xml
A       Config/popp/smoke-detector.xml
A       Config/popp/solar-siren.xml
M       Config/popp/zweather.xml
A       Config/qees/reto-dimmer-plus.xml
M       Config/qees/reto-plugin-switch.xml
M       Config/qubino/ZMNHAA2.xml
D       Config/qubino/ZMNHAD1.xml
A       Config/qubino/ZMNHADx.xml
M       Config/qubino/ZMNHBA2.xml
D       Config/qubino/ZMNHBD1.xml
D       Config/qubino/ZMNHBD2.xml
A       Config/qubino/ZMNHBDx.xml
M       Config/qubino/ZMNHCA2.xml
D       Config/qubino/ZMNHCD.xml
D       Config/qubino/ZMNHCD1.xml
A       Config/qubino/ZMNHCDx.xml
M       Config/qubino/ZMNHDA2.xml
D       Config/qubino/ZMNHDD1.xml
A       Config/qubino/ZMNHDDx.xml
M       Config/qubino/ZMNHIA2.xml
D       Config/qubino/ZMNHID1.xml
A       Config/qubino/ZMNHIDx.xml
M       Config/qubino/ZMNHJA2.xml
M       Config/qubino/ZMNHJD1.xml
A       Config/qubino/ZMNHLAx.xml
D       Config/qubino/ZMNHLD1.xml
D       Config/qubino/ZMNHND1.xml
A       Config/qubino/ZMNHNDx.xml
D       Config/qubino/ZMNHOD1.xml
A       Config/qubino/ZMNHODx.xml
D       Config/qubino/ZMNHSD1.xml
A       Config/qubino/ZMNHSDx.xml
A       Config/qubino/ZMNHTDx.xml
M       Config/qubino/ZMNHUD1.xml
A       Config/qubino/ZMNHZDx.xml
M       Config/rcs/em52-zw.xml
M       Config/rcs/pm12-zw.xml
M       Config/rcs/therm0005.xml
M       Config/rcs/therm0007.xml
M       Config/rcs/therm0009.xml
M       Config/remotec/zfm-80.xml
A       Config/remotec/zrc-90.xml
A       Config/remotec/zts-110.xml
M       Config/remotec/zurc.xml
M       Config/remotec/zxt-120.xml
M       Config/schlage/BE469NXCEN.xml
M       Config/schlagelink/itemp.xml
M       Config/schlagelink/minikeypad.xml
D       Config/sensative/strips-mazw.xml
A       Config/sensative/strips.xml
A       Config/stelpro/stzw402.xml
M       Config/swiid/swiidinter.xml
M       Config/swiid/swiidplug.xml
A       Config/thermofloor/heatit021.xml
D       Config/thermofloor/multireg.xml
M       Config/trane/TZEMT400AB32MAA.xml
M       Config/trane/TZEMT400BB32MAA.xml
M       Config/vision/zd2102.xml
A       Config/vision/zd2201.xml
A       Config/vision/zg8101.xml
M       Config/vision/zm1601eu.xml
A       Config/vision/zm1601eu5.xml
A       Config/vision/zm1602eu5.xml
M       Config/vision/zp3102.xml
A       Config/vision/zp3111.xml
M       Config/vision/zs5101eu.xml
M       Config/vitrum/vitrumBS.xml
M       Config/waynedalton/WDTC-20.xml
M       Config/wenzhou/sm103.xml
M       Config/wenzhou/tsp01.xml
M       Config/wenzhou/tz65d.xml
M       Config/wenzhou/tz66d.xml
M       Config/wenzhou/tz67.xml
M       Config/wenzhou/tz88.xml
M       Config/widom/UBS104.xml
M       Config/widom/UME304C_S.xml
M       Config/zipato/MiniKeypad.xml
M       Config/zipato/RGBBulb.xml
M       Config/zwave.me/ZME_05431.xml
D       Config/zwave.me/ZME_05461.xml
M       Config/zwave.me/ZME_06433.xml
M       Config/zwave.me/ZME_06436.xml
D       Config/zwave.me/ZME_064381.xml
M       Config/zwave.me/ZME_064435.xml
A       Config/zwave.me/ZME_RC2.xml
M       Config/zwave.me/ZME_WALLC-S.xml
M       Config/zwave.me/ZME_WCD2.xml
M       Config/zwave.me/iTemp.xml
M       Config/zwave.me/kfob.xml
A       Config/zwave.me/popp_kfob-c.xml
A       Config/zwave.me/zweather.xml
M       Config/zwcfg.xsd
M       Config/zwscene.xsd
M       History.txt
M       INSTALL.md
M       License.txt
M       MQTT/CMakeLists.txt
M       MQTT/tls_mosq.c
M       README.md
M       hardware/1Wire.cpp
M       hardware/1Wire.h
M       hardware/1Wire/1WireByKernel.cpp
M       hardware/1Wire/1WireByKernel.h
M       hardware/1Wire/1WireByOWFS.cpp
M       hardware/1Wire/1WireByOWFS.h
M       hardware/1Wire/1WireCommon.cpp
M       hardware/1Wire/1WireCommon.h
M       hardware/1Wire/1WireForWindows.cpp
M       hardware/1Wire/1WireForWindows.h
M       hardware/1Wire/1WireSystem.h
M       hardware/1Wire/OneWireDomoticzService/Installer/Installer.vdproj
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService.sln
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Logger/Logger.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Logger/RollingTraceListener.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/OneWireDomoticzService.csproj
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/OneWireDomoticzServiceConfig.xml
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Program.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Properties/AssemblyInfo.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Properties/Resources.Designer.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Properties/Resources.resx
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Properties/Settings.Designer.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Properties/Settings.settings
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Service/Service.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Service/ServiceRegister.Designer.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Service/ServiceRegister.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/ServiceRegister.Designer.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/Settings.cs
M       hardware/1Wire/OneWireDomoticzService/OneWireDomoticzService/app.config
M       hardware/ASyncSerial.cpp
M       hardware/ASyncTCP.cpp
M       hardware/ASyncTCP.h
A       hardware/AccuWeather.cpp
A       hardware/AccuWeather.h
M       hardware/AnnaThermostat.cpp
M       hardware/AnnaThermostat.h
M       hardware/AtagOne.cpp
A       hardware/BleBox.cpp
A       hardware/BleBox.h
A       hardware/Comm5Serial.cpp
A       hardware/Comm5Serial.h
M       hardware/Comm5TCP.cpp
M       hardware/Comm5TCP.h
M       hardware/CurrentCostMeterBase.cpp
M       hardware/CurrentCostMeterBase.h
M       hardware/CurrentCostMeterSerial.cpp
M       hardware/CurrentCostMeterSerial.h
M       hardware/CurrentCostMeterTCP.cpp
M       hardware/CurrentCostMeterTCP.h
M       hardware/DavisLoggerSerial.cpp
M       hardware/DavisLoggerSerial.h
A       hardware/DenkoviSmartdenLan.cpp
A       hardware/DenkoviSmartdenLan.h
M       hardware/DomoticzHardware.cpp
M       hardware/DomoticzHardware.h
M       hardware/DomoticzTCP.cpp
M       hardware/DomoticzTCP.h
M       hardware/Dummy.cpp
M       hardware/Dummy.h
M       hardware/ETH8020.cpp
M       hardware/ETH8020.h
A       hardware/Ec3kMeterTCP.cpp
A       hardware/Ec3kMeterTCP.h
M       hardware/EcoDevices.cpp
M       hardware/EcoDevices.h
M       hardware/EnOceanESP2.cpp
M       hardware/EnOceanESP2.h
M       hardware/EnOceanESP3.cpp
M       hardware/EnOceanESP3.h
A       hardware/Fitbit.cpp
A       hardware/Fitbit.h
M       hardware/ForecastIO.cpp
M       hardware/ForecastIO.h
M       hardware/FritzboxTCP.cpp
M       hardware/FritzboxTCP.h
M       hardware/Gpio.cpp
M       hardware/Gpio.h
M       hardware/GpioPin.cpp
M       hardware/GpioPin.h
M       hardware/HardwareMonitor.cpp
M       hardware/HardwareMonitor.h
M       hardware/HarmonyHub.cpp
M       hardware/HarmonyHub.h
A       hardware/HttpPoller.cpp
A       hardware/HttpPoller.h
M       hardware/I2C.cpp
M       hardware/I2C.h
M       hardware/ICYThermostat.cpp
M       hardware/ICYThermostat.h
M       hardware/KMTronic433.cpp
M       hardware/KMTronic433.h
M       hardware/KMTronicBase.cpp
M       hardware/KMTronicBase.h
M       hardware/KMTronicSerial.cpp
M       hardware/KMTronicSerial.h
M       hardware/KMTronicTCP.cpp
M       hardware/KMTronicTCP.h
M       hardware/Kodi.cpp
M       hardware/Kodi.h
M       hardware/Limitless.cpp
M       hardware/Limitless.h
M       hardware/MCP23x17.h
M       hardware/MQTT.cpp
M       hardware/MQTT.h
M       hardware/Meteostick.cpp
M       hardware/Meteostick.h
M       hardware/MochadTCP.cpp
M       hardware/MochadTCP.h
M       hardware/MySensorsBase.cpp
M       hardware/MySensorsBase.h
M       hardware/MySensorsSerial.cpp
M       hardware/MySensorsSerial.h
M       hardware/MySensorsTCP.cpp
M       hardware/MySensorsTCP.h
M       hardware/NefitEasy.cpp
M       hardware/NefitEasy.h
M       hardware/Netatmo.cpp
M       hardware/OTGWBase.cpp
M       hardware/OTGWBase.h
M       hardware/OTGWSerial.cpp
M       hardware/OTGWSerial.h
M       hardware/OTGWTCP.cpp
M       hardware/OTGWTCP.h
A       hardware/OpenWeatherMap.cpp
A       hardware/OpenWeatherMap.h
M       hardware/OpenWebNet.cpp
U       hardware/OpenZWave.cpp
M       hardware/OpenZWave.h
M       hardware/P1MeterBase.cpp
M       hardware/P1MeterBase.h
M       hardware/P1MeterSerial.cpp
M       hardware/P1MeterSerial.h
M       hardware/P1MeterTCP.cpp
M       hardware/P1MeterTCP.h
M       hardware/PVOutput_Input.cpp
M       hardware/PVOutput_Input.h
M       hardware/PanasonicTV.cpp
M       hardware/PanasonicTV.h
M       hardware/PhilipsHue.cpp
M       hardware/PhilipsHue.h
M       hardware/PiFace.cpp
M       hardware/PiFace.h
M       hardware/Pinger.cpp
M       hardware/Pinger.h
A       hardware/RAVEn.cpp
A       hardware/RAVEn.h
M       hardware/RFLinkBase.cpp
M       hardware/RFLinkBase.h
M       hardware/RFLinkTCP.cpp
A       hardware/RFXBase.cpp
A       hardware/RFXBase.h
M       hardware/RFXComSerial.cpp
M       hardware/RFXComSerial.h
M       hardware/RFXComTCP.cpp
M       hardware/RFXComTCP.h
M       hardware/Razberry.cpp
M       hardware/Razberry.h
M       hardware/Rego6XXSerial.cpp
M       hardware/Rego6XXSerial.h
M       hardware/S0MeterBase.cpp
M       hardware/S0MeterBase.h
M       hardware/S0MeterSerial.cpp
M       hardware/S0MeterSerial.h
A       hardware/S0MeterTCP.cpp
A       hardware/S0MeterTCP.h
U       hardware/SBFSpot.cpp
U       hardware/SBFSpot.h
M       hardware/SatelIntegra.cpp
M       hardware/SolarMaxTCP.cpp
M       hardware/SolarMaxTCP.h
A       hardware/Sterbox.cpp
A       hardware/Sterbox.h
M       hardware/TCPProxy/tcpproxy_server.cpp
M       hardware/TCPProxy/tcpproxy_server.h
M       hardware/TE923.cpp
M       hardware/TE923.h
M       hardware/TE923Tool.cpp
M       hardware/TE923Tool.h
M       hardware/Teleinfo.cpp
M       hardware/Teleinfo.h
M       hardware/Tellstick.cpp
M       hardware/Tellstick.h
M       hardware/Thermosmart.cpp
M       hardware/Thermosmart.h
M       hardware/ToonThermostat.cpp
M       hardware/ToonThermostat.h
M       hardware/VolcraftCO20.cpp
M       hardware/VolcraftCO20.h
M       hardware/WOL.cpp
M       hardware/WOL.h
M       hardware/Winddelen.cpp
M       hardware/Winddelen.h
M       hardware/Wunderground.cpp
M       hardware/Wunderground.h
M       hardware/YouLess.cpp
M       hardware/YouLess.h
M       hardware/ZWaveBase.cpp
M       hardware/ZWaveBase.h
M       hardware/ZWaveCommands.h
M       hardware/csocket.cpp
M       hardware/evohome.cpp
M       hardware/evohome.h
M       hardware/hardwaretypes.h
M       hardware/libusbwinusbbridge.cpp
M       hardware/libusbwinusbbridge.h
M       hardware/openzwave/Bitfield.h
M       hardware/openzwave/Defs.h
M       hardware/openzwave/DoxygenMain.h
M       hardware/openzwave/Driver.h
M       hardware/openzwave/Group.h
M       hardware/openzwave/Manager.h
M       hardware/openzwave/Msg.h
M       hardware/openzwave/Node.h
M       hardware/openzwave/Notification.h
M       hardware/openzwave/OZWException.h
M       hardware/openzwave/Options.h
M       hardware/openzwave/Scene.h
M       hardware/openzwave/Utils.h
M       hardware/openzwave/ZWSecurity.h
M       hardware/openzwave/aes/aes.h
M       hardware/openzwave/aes/aescpp.h
M       hardware/openzwave/aes/aesopt.h
M       hardware/openzwave/aes/aestab.h
M       hardware/openzwave/aes/brg_endian.h
M       hardware/openzwave/aes/brg_types.h
M       hardware/openzwave/command_classes/Alarm.h
M       hardware/openzwave/command_classes/ApplicationStatus.h
M       hardware/openzwave/command_classes/Association.h
M       hardware/openzwave/command_classes/AssociationCommandConfiguration.h
M       hardware/openzwave/command_classes/Basic.h
M       hardware/openzwave/command_classes/BasicWindowCovering.h
M       hardware/openzwave/command_classes/Battery.h
M       hardware/openzwave/command_classes/CRC16Encap.h
M       hardware/openzwave/command_classes/CentralScene.h
M       hardware/openzwave/command_classes/ClimateControlSchedule.h
M       hardware/openzwave/command_classes/Clock.h
M       hardware/openzwave/command_classes/Color.h
M       hardware/openzwave/command_classes/CommandClass.h
M       hardware/openzwave/command_classes/CommandClasses.h
M       hardware/openzwave/command_classes/Configuration.h
M       hardware/openzwave/command_classes/ControllerReplication.h
M       hardware/openzwave/command_classes/DeviceResetLocally.h
M       hardware/openzwave/command_classes/DoorLock.h
M       hardware/openzwave/command_classes/DoorLockLogging.h
M       hardware/openzwave/command_classes/EnergyProduction.h
M       hardware/openzwave/command_classes/Hail.h
M       hardware/openzwave/command_classes/Indicator.h
M       hardware/openzwave/command_classes/Language.h
M       hardware/openzwave/command_classes/Lock.h
M       hardware/openzwave/command_classes/ManufacturerSpecific.h
M       hardware/openzwave/command_classes/Meter.h
M       hardware/openzwave/command_classes/MeterPulse.h
M       hardware/openzwave/command_classes/MultiCmd.h
M       hardware/openzwave/command_classes/MultiInstance.h
M       hardware/openzwave/command_classes/MultiInstanceAssociation.h
M       hardware/openzwave/command_classes/NoOperation.h
M       hardware/openzwave/command_classes/NodeNaming.h
M       hardware/openzwave/command_classes/Powerlevel.h
M       hardware/openzwave/command_classes/Proprietary.h
M       hardware/openzwave/command_classes/Protection.h
M       hardware/openzwave/command_classes/SceneActivation.h
M       hardware/openzwave/command_classes/Security.h
M       hardware/openzwave/command_classes/SensorAlarm.h
M       hardware/openzwave/command_classes/SensorBinary.h
M       hardware/openzwave/command_classes/SensorMultilevel.h
M       hardware/openzwave/command_classes/SwitchAll.h
M       hardware/openzwave/command_classes/SwitchBinary.h
M       hardware/openzwave/command_classes/SwitchMultilevel.h
M       hardware/openzwave/command_classes/SwitchToggleBinary.h
M       hardware/openzwave/command_classes/SwitchToggleMultilevel.h
M       hardware/openzwave/command_classes/ThermostatFanMode.h
M       hardware/openzwave/command_classes/ThermostatFanState.h
M       hardware/openzwave/command_classes/ThermostatMode.h
M       hardware/openzwave/command_classes/ThermostatOperatingState.h
M       hardware/openzwave/command_classes/ThermostatSetpoint.h
M       hardware/openzwave/command_classes/TimeParameters.h
M       hardware/openzwave/command_classes/UserCode.h
M       hardware/openzwave/command_classes/Version.h
M       hardware/openzwave/command_classes/WakeUp.h
M       hardware/openzwave/command_classes/ZWavePlusInfo.h
M       hardware/openzwave/control_panel/ozwcp.cpp
M       hardware/openzwave/control_panel/ozwcp.h
M       hardware/openzwave/control_panel/tinyxml/tinystr.cpp
M       hardware/openzwave/control_panel/tinyxml/tinystr.h
M       hardware/openzwave/control_panel/tinyxml/tinyxml.cpp
M       hardware/openzwave/control_panel/tinyxml/tinyxml.h
M       hardware/openzwave/control_panel/tinyxml/tinyxmlerror.cpp
M       hardware/openzwave/control_panel/tinyxml/tinyxmlparser.cpp
M       hardware/openzwave/control_panel/zwavelib.cpp
M       hardware/openzwave/platform/Controller.h
M       hardware/openzwave/platform/Event.h
M       hardware/openzwave/platform/FileOps.h
M       hardware/openzwave/platform/HidController.h
M       hardware/openzwave/platform/Log.h
M       hardware/openzwave/platform/Mutex.h
M       hardware/openzwave/platform/Ref.h
M       hardware/openzwave/platform/SerialController.h
M       hardware/openzwave/platform/Stream.h
M       hardware/openzwave/platform/Thread.h
M       hardware/openzwave/platform/TimeStamp.h
M       hardware/openzwave/platform/Wait.h
M       hardware/openzwave/value_classes/Value.h
M       hardware/openzwave/value_classes/ValueBool.h
M       hardware/openzwave/value_classes/ValueButton.h
M       hardware/openzwave/value_classes/ValueByte.h
M       hardware/openzwave/value_classes/ValueDecimal.h
M       hardware/openzwave/value_classes/ValueID.h
M       hardware/openzwave/value_classes/ValueInt.h
M       hardware/openzwave/value_classes/ValueList.h
M       hardware/openzwave/value_classes/ValueRaw.h
M       hardware/openzwave/value_classes/ValueSchedule.h
M       hardware/openzwave/value_classes/ValueShort.h
M       hardware/openzwave/value_classes/ValueStore.h
M       hardware/openzwave/value_classes/ValueString.h
M       hardware/pinger/icmp_header.h
M       hardware/pinger/ipv4_header.h
M       hardware/serial/impl/unix.cpp
M       hardware/serial/impl/win.cpp
M       hardware/serial/serial.cpp
M       httpclient/HTTPClient.cpp
M       httpclient/HTTPClient.h
M       httpclient/UrlEncode.cpp
M       httpclient/UrlEncode.h
M       libusb/hidpi.h
M       libusb/hidsdi.h
M       libusb/hidusage.h
M       libusb/usb.h
M       libusb/usb100.h
M       libusb/usb200.h
M       libusb/winusb.h
M       libusb/winusbio.h
M       lua/CMakeLists.txt
M       lua/src/CMakeLists.txt
M       lua/src/LuaMSVS/LuaMSVS.sln
M       lua/src/LuaMSVS/LuaMSVS.vcxproj
M       lua/src/LuaMSVS/LuaMSVS.vcxproj.filters
M       main/Camera.cpp
M       main/Camera.h
M       main/CmdLine.cpp
M       main/CmdLine.h
D       main/DataPush.cpp
D       main/DataPush.h
M       main/EventSystem.cpp
M       main/EventSystem.h
M       main/Helper.cpp
M       main/Helper.h
D       main/HttpPush.cpp
D       main/HttpPush.h
M       main/Logger.cpp
M       main/Logger.h
A       main/LuaHandler.cpp
A       main/LuaHandler.h
D       main/Push.cpp
D       main/Push.h
M       main/RFXNames.cpp
M       main/RFXNames.h
M       main/RFXtrx.h
M       main/SQLHelper.cpp
M       main/SQLHelper.h
M       main/Scheduler.cpp
M       main/Scheduler.h
M       main/SunRiseSet.cpp
M       main/SunRiseSet.h
M       main/WebServer.cpp
M       main/WebServer.h
M       main/WebServerHelper.cpp
M       main/WebServerHelper.h
M       main/WindCalculation.cpp
M       main/WindCalculation.h
M       main/appversion.h
M       main/dirent_windows.h
M       main/domoticz.cpp
M       main/localtime_r.cpp
M       main/localtime_r.h
M       main/mainstructs.h
M       main/mainworker.cpp
M       main/mainworker.h
M       main/stdafx.cpp
M       main/stdafx.h
M       main/targetver.h
M       main/unzip.h
M       main/unzip_iterator.h
M       main/unzip_stream.h
M       msbuild/Debug/OpenZWaved.dll
M       msbuild/Version.h
M       msbuild/WindowsHelper.cpp
M       msbuild/WindowsHelper.h
M       msbuild/WindowsInstaller/DomoticzSetup.iss
M       msbuild/WindowsInstaller/Readme.txt
M       msbuild/domoticz.rc
M       msbuild/domoticz.sln
M       msbuild/domoticz.vcxproj
M       msbuild/domoticz.vcxproj.filters
M       msbuild/resource.h
M       notifications/NotificationBase.cpp
M       notifications/NotificationBase.h
M       notifications/NotificationEmail.cpp
M       notifications/NotificationEmail.h
M       notifications/NotificationHTTP.cpp
M       notifications/NotificationHTTP.h
M       notifications/NotificationHelper.cpp
M       notifications/NotificationHelper.h
M       notifications/NotificationKodi.cpp
M       notifications/NotificationKodi.h
M       notifications/NotificationLogitechMediaServer.cpp
M       notifications/NotificationNma.cpp
M       notifications/NotificationNma.h
M       notifications/NotificationProwl.cpp
M       notifications/NotificationProwl.h
M       notifications/NotificationPushalot.cpp
M       notifications/NotificationPushalot.h
M       notifications/NotificationPushover.cpp
M       notifications/NotificationPushover.h
M       notifications/NotificationSMS.cpp
M       notifications/NotificationSMS.h
M       notifications/xmbcclient.h
A       push/DataPush.cpp
A       push/DataPush.h
A       push/GooglePubSubPush.cpp
A       push/GooglePubSubPush.h
A       push/HttpPush.cpp
A       push/HttpPush.h
A       push/Push.cpp
A       push/Push.h
M       scripts/_domoticz_main.bat
M       scripts/lua_parsers/example.lua
M       scripts/lua_parsers/example_json.lua
A       scripts/lua_parsers/example_owm.lua
M       scripts/lua_parsers/example_xml.lua
A       scripts/python/googlepubsub.py
M       scripts/templates/All.Lua
M       scripts/templates/Device.Lua
M       scripts/templates/Security.Lua
M       scripts/templates/Time.Lua
M       scripts/templates/UserVariable.Lua
M       smtpclient/SMTPClient.cpp
M       smtpclient/SMTPClient.h
M       sqlite/CMakeLists.txt
M       sqlite/sqlite3.c
M       sqlite/sqlite3.h
M       tcpserver/TCPClient.cpp
M       tcpserver/TCPClient.h
M       tcpserver/TCPServer.cpp
M       tcpserver/TCPServer.h
M       tinyxpath/AUTHORS
M       tinyxpath/CMakeLists.txt
M       tinyxpath/ChangeLog
M       tinyxpath/Makefile.am
M       tinyxpath/Makefile.configure
M       tinyxpath/README
M       tinyxpath/action_store.cpp
M       tinyxpath/action_store.h
M       tinyxpath/build
M       tinyxpath/byte_stream.h
M       tinyxpath/configure.in
M       tinyxpath/htmlutil.cpp
M       tinyxpath/htmlutil.h
M       tinyxpath/lex_token.h
M       tinyxpath/lex_util.cpp
M       tinyxpath/lex_util.h
M       tinyxpath/main.cpp
M       tinyxpath/node_set.cpp
M       tinyxpath/node_set.h
M       tinyxpath/openoff.xml
M       tinyxpath/rss2_projnews.xml
M       tinyxpath/test.xml
M       tinyxpath/tinystr.cpp
M       tinyxpath/tinystr.h
M       tinyxpath/tinyxml.cpp
M       tinyxpath/tinyxml.h
M       tinyxpath/tinyxmlerror.cpp
M       tinyxpath/tinyxmlparser.cpp
M       tinyxpath/tinyxpath.dsp
M       tinyxpath/tinyxpath.sln
M       tinyxpath/tinyxpath.vcproj
M       tinyxpath/tinyxpath_conf.h
M       tinyxpath/tokenlist.cpp
M       tinyxpath/tokenlist.h
M       tinyxpath/xml_util.cpp
M       tinyxpath/xml_util.h
M       tinyxpath/xpath_expression.cpp
M       tinyxpath/xpath_expression.h
M       tinyxpath/xpath_processor.cpp
M       tinyxpath/xpath_processor.h
M       tinyxpath/xpath_stack.cpp
M       tinyxpath/xpath_stack.h
M       tinyxpath/xpath_static.cpp
M       tinyxpath/xpath_static.h
M       tinyxpath/xpath_stream.cpp
M       tinyxpath/xpath_stream.h
M       tinyxpath/xpath_syntax.cpp
M       tinyxpath/xpath_syntax.h
M       tools/.tx/config
M       tools/get_translations.bat
M       webserver/Base64.cpp
M       webserver/Base64.h
M       webserver/GZipHelper.h
M       webserver/cWebem.cpp
M       webserver/cWebem.h
M       webserver/connection.cpp
M       webserver/connection.hpp
M       webserver/connection_manager.cpp
M       webserver/connection_manager.hpp
M       webserver/fastcgi.cpp
M       webserver/fastcgi.hpp
M       webserver/header.hpp
M       webserver/mime_types.cpp
M       webserver/mime_types.hpp
M       webserver/proxyclient.cpp
M       webserver/proxyclient.h
M       webserver/proxycommon.cpp
M       webserver/proxycommon.h
M       webserver/reply.cpp
M       webserver/reply.hpp
M       webserver/request.hpp
M       webserver/request_handler.cpp
M       webserver/request_handler.hpp
M       webserver/request_parser.cpp
M       webserver/request_parser.hpp
M       webserver/server.cpp
M       www/app/CamController.js
M       www/app/CustomIconsController.js
M       www/app/DPFibaroController.js
A       www/app/DPGooglePubSubController.js
M       www/app/DPHttpController.js
M       www/app/DashboardController.js
M       www/app/DevicesController.js
M       www/app/EventsController.js
M       www/app/FloorplanController.js
M       www/app/FloorplanEditController.js
M       www/app/ForecastController.js
M       www/app/FrontpageController.js
M       www/app/HardwareController.js
M       www/app/HistoryController.js
M       www/app/LightsController.js
M       www/app/LogController.js
M       www/app/LoginController.js
M       www/app/LogoutController.js
M       www/app/NotificationController.js
M       www/app/OfflineController.js
M       www/app/RFXComFirmwareController.js
M       www/app/RestoreDatabaseController.js
M       www/app/RoomplanController.js
M       www/app/ScenesController.js
M       www/app/SetupController.js
M       www/app/TemperatureController.js
A       www/app/TemperatureCustomLogController.js
A       www/app/TemperatureLogController.js
A       www/app/TemperatureNotificationsController.js
M       www/app/UpdateController.js
M       www/app/UserVariablesController.js
M       www/app/UsersController.js
M       www/app/UtilityController.js
M       www/app/WeatherController.js
M       www/app/ZWaveTopologyController.js
M       www/app/app.js
M       www/app/main.js
M       www/css/jquery-ui-timepicker-addon.css
M       www/css/style.css
M       www/eventsframe.html
M       www/html5.appcache
M       www/i18n/domoticz-ar.json.gz
M       www/i18n/domoticz-bg.json.gz
M       www/i18n/domoticz-ca.json.gz
M       www/i18n/domoticz-cs.json.gz
M       www/i18n/domoticz-da.json.gz
M       www/i18n/domoticz-de.json.gz
M       www/i18n/domoticz-el.json.gz
M       www/i18n/domoticz-en.json.gz
M       www/i18n/domoticz-es.json.gz
M       www/i18n/domoticz-fi.json.gz
M       www/i18n/domoticz-fr.json.gz
M       www/i18n/domoticz-he.json.gz
M       www/i18n/domoticz-hu.json.gz
M       www/i18n/domoticz-is.json.gz
M       www/i18n/domoticz-it.json.gz
M       www/i18n/domoticz-lt.json.gz
M       www/i18n/domoticz-mk.json.gz
M       www/i18n/domoticz-nl.json.gz
M       www/i18n/domoticz-no.json.gz
M       www/i18n/domoticz-pl.json.gz
M       www/i18n/domoticz-pt.json.gz
M       www/i18n/domoticz-ro.json.gz
M       www/i18n/domoticz-ru.json.gz
M       www/i18n/domoticz-sk.json.gz
M       www/i18n/domoticz-sl.json.gz
M       www/i18n/domoticz-sr.json.gz
M       www/i18n/domoticz-sv.json.gz
M       www/i18n/domoticz-th.json.gz
M       www/i18n/domoticz-tr.json.gz
M       www/i18n/domoticz-uk.json.gz
M       www/i18n/domoticz-zh.json.gz
M       www/index.html
M       www/js/domoticz.js.gz
M       www/js/domoticzdevices.js.gz
M       www/js/highcharts-more.js.gz
M       www/js/highcharts.js.gz
M       www/js/modules/exporting.js.gz
M       www/js/themes/dark-blue.js.gz
M       www/js/themes/dark-green.js.gz
A       www/js/themes/dark-ucust.js.gz
M       www/js/themes/gray.js.gz
M       www/js/themes/grid.js.gz
M       www/js/themes/skies.js.gz
M       www/ozwcp/cp.html
M       www/ozwcp/cp.js
M       www/ozwcp/ozwcp.html
M       www/secpanel/font/Digital.svg
M       www/secpanel/index.html
M       www/styles/default/custom.css
M       www/styles/element-dark/custom.css
M       www/styles/element-light/custom.css
M       www/styles/elemental/custom.css
M       www/styles/simple-blue/custom.css
M       www/styles/simple-gray/custom.css
M       www/switch_icons.txt
M       www/templates/custom.example
M       www/views/cam.html
M       www/views/customicons.html
M       www/views/dashboard.html
M       www/views/devices.html
M       www/views/dpfibaro.html
A       www/views/dpgooglepubsub.html
M       www/views/dphttp.html
M       www/views/events.html
M       www/views/forecast.html
M       www/views/frontpage.html
M       www/views/frontpage_example.html
M       www/views/hardware.html
M       www/views/history.html
M       www/views/lights.html
M       www/views/log.html
M       www/views/login.html
M       www/views/logout.html
M       www/views/notification.html
M       www/views/offline.html
M       www/views/restoredatabase.html
M       www/views/rfxcomfirmware.html
M       www/views/roomplan.html
M       www/views/scenes.html
M       www/views/setup.html
M       www/views/temperature.html
A       www/views/temperature_custom_temp_log.html
A       www/views/temperature_log.html
A       www/views/temperature_notifications.html
A       www/views/temperatures/temperatureWidget.html
M       www/views/update.html
M       www/views/users.html
M       www/views/uservariables.html
M       www/views/utility.html
M       www/views/weather.html
M       www/zwavetopology.html
M       zip/unzip.cpp
M       zip/zip.cpp
M       zip/zip.h
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
osmc@osmc:~/dev-domoticz$

[happer66]

I've struggled with conflicts as well quite a few times, this might be horrible advice (and if anyone says so, do listen to 'em!)
But simply removing the conflicting files should have you up and about again, try (if you still have failures I might have missed one or two):

Code: Select all

rm hardware/SBFSpot.h hardware/SBFSpot.cpp hardware/OpenZWave.cpp # simply deletes them
git fetch && git merge # or git pull

...if there's a bunchload of them conflicting thingamabobs it might be simpler to remove the entire folder instead, just make sure you don't remove anything you wish to keep like your database/config/backup etc.