How to update the master branch?

[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

[bhepler]

@robiv8 - You can delete those files and then do another git pull. So:

cd ~/MagicMirror
rm package-lock.json
rm vendor/package-lock.json
git pull
npm install

[shazam23]

@ninjabreadman I followed these steps and after running git stash apply I still get the “please commit changes” message…I’ve already backed up so unless the new update is thinking it also needs to be backed up I’m lost

[tcsabina]

@shazam23
You have modified files that has not been ‘saved’ in the git database. Type ‘git status’, and it will list those changes.
After that you can decide what to do: keep the changes (in this case use ‘git commit’)
revert or discard the changes (in this case ‘git checkout’ is the command, if I am not mistaken)

Not sure what exactly you try to achieve, but for an update I would use a fresh directory instead. Just create a new one and clone into it…