Solved git pull can´t update Gateway
-
git pull can´t update Gateway. …
pi@raspberrypi:~/MagicMirror/modules/Gateway $ git pull
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.
remote: Enumerating objects: 11, done.
remote: Counting objects: 100% (11/11), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 11 (delta 6), reused 10 (delta 6), pack-reused 0
Unpacking objects: 100% (11/11), 2.48 KiB | 47.00 KiB/s, done.
From https://github.com/bugsounet/Gateway
0a076ca…7d7b1eb master -> origin/master
fce686c…c473cc2 dev -> origin/dev
Updating 7f1a902…7d7b1eb
error: Your local changes to the following files would be overwritten by merge:
Gateway.js
components/GWTools.js
components/GatewayMiddleware.js
components/loadLibraries.js
components/speedtest-net.js
components/speedtest.js
components/systemInformation.js
components/translations.js
node_helper.js
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror/modules/Gateway $ ^C
pi@raspberrypi:~/MagicMirror/modules/Gateway $ -
npm run update works
-
that why I write an update command
My place in France Top committers of Github:
-
@bugsounet Hi, you are PRO and that´s the reason why i donate you
-
Thx for my coffee !
-
You´re welcome…
when i´m in donators group? -
Oh thank you did it while i was writing last comment
