Domoticz

I wanted to do a fresh install of Dashticz ((have been messing up too much of it), so I did clone a new version from the git hub page. After that I changed the config in the .git directory to PULL the beta versions.

Now I've got the following messages:

Auto-merging js/weather.js
CONFLICT (content): Merge conflict in js/weather.js
Auto-merging js/version.js
CONFLICT (content): Merge conflict in js/version.js
Auto-merging js/publictransport.js
Automatic merge failed; fix conflicts and then commit the result.

Now, the dashboard isn't showing anymore

I think you have to clone the beta version:
git clone https://github.com/Dashticz/dashticz_v2 --branch beta
After that git pull should work to get the new beta updates. (assuming you didn't modify the files yourself)

Ofcourse... :facepalm:

So obviously. O just blame this on ... yhmmmm... Domoticz not working with beta for me, that I just forgot about the beta for this

EdwinK wrote: ↑Tuesday 30 October 2018 15:03 Ofcourse... :facepalm:

So obviously. O just blame this on ... yhmmmm... Domoticz not working with beta for me, that I just forgot about the beta for this

I had exctly the same when installing fresh