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 ?