update error

Dashticz, alternative dashboard based on HTML, CSS, jQuery

Moderators: leecollings, htilburgs, robgeerts

Post Reply
JuanUil
Posts: 498
Joined: Friday 22 May 2015 12:21
Target OS: Raspberry Pi / ODroid
Domoticz version: 4.11083
Location: Asten NB Nederland
Contact:

update error

Post by JuanUil »

Hi there,

I want to update to the new version but i can not get over this:

git pull
Updating e729d55..372b8fe
error: Your local changes to the following files would be overwritten by merge:
css/creative.css
docs/blocks/domoticzblocks.rst
docs/releasenotes/releasenotes.rst
js/blocks.js
js/blocktypes.js
js/components/domoticzblock.js
js/components/group.js
js/dashticz.js
js/loader.js
js/switches.js
js/thermostat.js
package-lock.json
package.json
tpl/thermostat_block.tpl
version.txt
Please commit your changes or stash them before you merge.
Aborting
make: *** [Makefile:119: update] Fout 1

Help please
Jan
Your mind is like a parachute,
It only works when it is opened!

RPI4 several Fibaro, KaKu, Neocoolcam switches, Z-Wave, Zigbee2Mqtt, Ikea bulbs and remote, Zigbee temp nodes
User avatar
jvdz
Posts: 2333
Joined: Tuesday 30 December 2014 19:25
Target OS: Raspberry Pi / ODroid
Domoticz version: 4.107
Location: Netherlands
Contact:

Re: update error

Post by jvdz »

You have made "local" changes to the github repository, so you need to tell github what to do with those changes.
Do you remember why you have done them and what you changed?
New Garbage collection scripts: https://github.com/jvanderzande/GarbageCalendar
User avatar
gizmocuz
Posts: 2551
Joined: Thursday 11 July 2013 18:59
Target OS: Raspberry Pi / ODroid
Domoticz version: beta
Location: Top of the world
Contact:

Re: update error

Post by gizmocuz »

If you are uncertain, you can always issue this command before updating the sources (you will loose all changes)

git reset --hard origin/development

Assuming you are on the development branch

If you are a regular user, I wont advise compiling/running from source
Quality outlives Quantity!
Post Reply

Who is online

Users browsing this forum: No registered users and 1 guest