• Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
MagicMirror Forum
  • Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
A New Chapter for MagicMirror: The Community Takes the Lead
Read the statement by Michael Teeuw here.

How to update the master branch?

Scheduled Pinned Locked Moved Troubleshooting
19 Posts 15 Posters 15.4k Views 12 Watching
Loading More Posts
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • M Offline
    MichMich Admin @navyvette87
    last edited by Apr 3, 2018, 9:46 AM

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

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

    1 Reply Last reply Reply Quote 1
    • E Offline
      E3V3A @ninjabreadman
      last edited by Apr 4, 2018, 3:43 AM

      @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.)

      "Everything I do (here) is for free – altruism is the way!"
      MMM-FlightsAbove, MMM-Tabulator, MMM-Assistant (co-maintainer)

      1 Reply Last reply Reply Quote 0
      • S Offline
        strawberry 3.141 Project Sponsor Module Developer
        last edited by Apr 4, 2018, 6:16 AM

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

        Please create a github issue if you need help, so I can keep track

        N 1 Reply Last reply Apr 4, 2018, 11:02 AM Reply Quote 1
        • N Offline
          ninjabreadman @strawberry 3.141
          last edited by Apr 4, 2018, 11:02 AM

          @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.

          Problem with config or JavaScript? Copy/paste it into JSHint.
          Check out the detailed walkthroughs on install, config, modules, etc.

          1 Reply Last reply Reply Quote 0
          • D Offline
            Dicous
            last edited by Apr 9, 2018, 5:11 PM

            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
            
            
            1 Reply Last reply Reply Quote 0
            • F Offline
              Frans @ninjabreadman
              last edited by Jan 3, 2019, 3:48 PM

              @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?

              S 1 Reply Last reply Jan 3, 2019, 3:50 PM Reply Quote 0
              • S Away
                sdetweil @Frans
                last edited by Jan 3, 2019, 3:50 PM

                @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

                Sam

                How to add modules

                learning how to use browser developers window for css changes

                F 1 Reply Last reply Jan 3, 2019, 3:52 PM Reply Quote 1
                • F Offline
                  Frans @sdetweil
                  last edited by Jan 3, 2019, 3:52 PM

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

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

                  Worked!! Thanks!

                  1 Reply Last reply Reply Quote 0
                  • R Offline
                    robiv8
                    last edited by Jan 3, 2019, 9:08 PM

                    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

                    B 1 Reply Last reply Jan 4, 2019, 1:43 AM Reply Quote 0
                    • B Offline
                      bhepler Module Developer @robiv8
                      last edited by Jan 4, 2019, 1:43 AM

                      @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
                      
                      1 Reply Last reply Reply Quote 0
                      • 1
                      • 2
                      • 2 / 2
                      • First post
                        Last post
                      Enjoying MagicMirror? Please consider a donation!
                      MagicMirror created by Michael Teeuw.
                      Forum managed by Sam, technical setup by Karsten.
                      This forum is using NodeBB as its core | Contributors
                      Contact | Privacy Policy