How to update the master branch?

navyvette87

Thanks guys, I have one more to upgrade. And figure out why MMM-Traffic won’t upgrade, but I think you way around would help that to.

MichMich

cd ~/MagicMirror/modules/MMM-Traffic
git pull

Restart your MagicMirror and you should be good to go. ;)

E3V3A

@ninjabreadman said in How to update the master branch?:

@PaulB First, make a backup of your install with cp -r ~/MagicMirror ~/MM-Backup.

Noo! Not a good idea if you’re running on a RPi with small SD card. That is a huge directory: du -sh ./ ~1.3GB, already for a quite small install. You might need that space for the update itself. Never good idea to max out your SD card.

Rather use tar, and try one of these:

cd ~
# remove `v` flag to avoid huge verbose output
tar --exclude={.git,node_modules} -zcvf MM_BAK.tgz ./MagicMirror
tar --exclude='node_modules' --exclude='.git' -zcvf MM_BAK.tgz ./MagicMirror

# This may require you to have the bash shell option globstar' set.
# Check with: 'shopt -s globstar'
tar --exclude='**/.git/*' --exclude='**/node_modules/*' -zcvf MM_BAK.tgz ./MagicMirror

This will avoid getting the huge node_modules and .git directories.
(You can always git init and reset your git origin url to git fetch from the resp directories if needed to re-instate.)

strawberry 3.141

if you are using mm as supposed to you only need to backup the config.js and custom.css

ninjabreadman

@e3v3a I take your point; in my case I’m running a reasonable size card and Raspbian/MM are all that is on the card. I do also mention to delete MM-Backup when they’re done. I really just wanted to give them the extra insurance of a full backup. Good call on tar, but they then need to know how to unpack it.

@strawberry-3.141 If you’re using git to stash changes, then you’ve clearly modified other files (IIRC, config.js and maybe custom.css are ignored). As above, I just wanted to give extra assurance that they had a full copy if anything went totally awry.

Dicous

Hallo,

noob braucht hilfe =)

Wie kann ich bei dieser Fehlermeldung updaten?


pi@raspberrypi:~ $ cd ~/MagicMirror && git pull
Aktualisiere 8010e62..60b9a5b
error: Your local changes to the following files would be overwritten by merge:
        modules/default/calendar/calendar.js
        modules/default/compliments/compliments.js

Frans

@ninjabreadman - I tried to update accordingly your reply but i’m stranded. After git stash the system tells me

pi@magicpi:~/MagicMirror $ git stash

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'pi@magicpi.(none)')
Cannot save the current index state

I don’t know how to react on this, you?

sdetweil

@frans said in How to update the master branch?:

git config --global user.email “you@example.com”
git config --global user.name “Your Name”

type those commands, add your email and name
git doesn’t allow anonymous actions

Frans

@sdetweil said in How to update the master branch?:

git config --global user.name “Your Name”

Worked!! Thanks!

robiv8

Und was soll uns das sagen?
Any info about this error?

pi@WEG-Infopanel:~/MagicMirror $ git stash
package-lock.json: needs merge
vendor/package-lock.json: needs merge
package-lock.json: needs merge
vendor/package-lock.json: needs merge
package-lock.json: unmerged (928d17635a4aff632b96c3d78499948e24eb70be)
package-lock.json: unmerged (1e84cc321d5ecb4199add46a08bfd7f3446d9c11)
package-lock.json: unmerged (281f5adadabad8c0fa36c54a8b5c882b66e06722)
vendor/package-lock.json: unmerged (a326b4026808f4b1ab060fe3c12e385f82330759)
vendor/package-lock.json: unmerged (793948105835abe0d92caaf321cb78150cc983a4)
vendor/package-lock.json: unmerged (9ad15ee58a9adce0f84708789296d2ae2ec1e029)
fatal: git-write-tree: error building trees
Kann den aktuellen Zustand des Index nicht speichern