Error after GIT CLONE Topic is solved

Dashticz, alternative dashboard based on HTML, CSS, jQuery

Moderators: robgeerts, htilburgs

Post Reply
User avatar
EdwinK
Posts: 1411
Joined: Sunday 22 January 2017 22:46
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Rhoon
Contact:

Error after GIT CLONE

Post by EdwinK » Tuesday 30 October 2018 13:07

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
Running latest BETA on a Pi-3 | Toon® Thermostat (rooted) | RFxcom | Dashticz V2

Lokonli
Posts: 151
Joined: Monday 29 August 2016 22:40
Target OS: Raspberry Pi
Domoticz version:
Contact:

Re: Error after GIT CLONE

Post by Lokonli » Tuesday 30 October 2018 14:37

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)

User avatar
EdwinK
Posts: 1411
Joined: Sunday 22 January 2017 22:46
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Rhoon
Contact:

Re: Error after GIT CLONE

Post by EdwinK » Tuesday 30 October 2018 16: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 ;)
Running latest BETA on a Pi-3 | Toon® Thermostat (rooted) | RFxcom | Dashticz V2

User avatar
robgeerts
Posts: 1247
Joined: Saturday 24 January 2015 23:12
Target OS: NAS (Synology & others)
Domoticz version: 3.7067
Location: NL
Contact:

Re: Error after GIT CLONE

Post by robgeerts » Thursday 01 November 2018 11:12

EdwinK wrote:
Tuesday 30 October 2018 16: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 :)
Creator of Dashticz
Do you appreciate my work and want to buy me a beer?
Send:
- XVG to D8fwNbyV6YxJk1aSiXftWTtdaPipsKn2Fa
- ANY ERC20-TOKEN to 0x9b8ee84329d77765a28bca188218c6c793875a8a

or donate via PayPal: https://www.paypal.me/robgeerts

Post Reply

Who is online

Users browsing this forum: No registered users and 5 guests