update error

[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

[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?

[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

[JuanUil]

I don't remember making any changes.
When I do:
git reset --hard origin/development
fatal: ambiguous argument 'origin/development': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

[waltervl]

I think gizmocuz thought it was a Domoticz source files issue and not a Dashticz issue.
I think you should do the following for Dashticz to get over this issue:

Code: Select all

git reset --hard
git pull --force

[JuanUil]

Thnx very much, that did the trick