MMM-Pir

htilburgs

@gonzonia
Ok 👍 succes.

gonzonia

Okay, sorry to revive this. I saw there was an update available so I went to update.

I did a git pull and got this

hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
From https://github.com/bugsounet/MMM-Pir
   3a5bcdb..1fee537  master     -> origin/master
   fc5b3f6..658a322  dev        -> origin/dev
Updating 3a5bcdb..1fee537
error: Your local changes to the following files would be overwritten by merge:
	MMM-Pir.js
	components/cronJob.js
	components/governorLib.js
	components/motion.js
	components/motionLib.js
	components/pirLib.js
	components/screenDisplayer.js
	components/screenLib.js
	components/screenTouch.js
	node_helper.js
Please commit your changes or stash them before you merge.
Aborting

The thing is, I know I have made NO CHANGES to any of those files.
Should I run a pull.rebase? Would that fix it ?

gonzonia

I just did a reinstall for now, but I would like to know what I should do to fix this in the future

sdetweil

@gonzonia the question is what did you do before

Sounds like you might have downloaded the zip over the files in the working directory, or copied files from somewhere else

In general, the force way to get back to the repo level
is

git reset --hard HEAD

This will restore all the files to the last commit level.
IF you made changes for some reason , they will be wiped out, no warnings.

git status before git pull will tell you if there are any changed files,
and git diff will show you the changes

bugsounet

Readme says:

see there

gonzonia

@bugsounet and that’s what I did wrong! thank you!

sdetweil

@bugsounet you should make it normal, like the rest of the modules…

gonzonia

@sdetweil This is helpful, thank you. I guarantee I made no changes though. I think it’s just that it needs to use npm run update

bugsounet

@sdetweil of course not :)