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

Update Magic Mirror error

Scheduled Pinned Locked Moved Unsolved Troubleshooting
8 Posts 3 Posters 2.7k Views 3 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
    MisterT
    last edited by Sep 4, 2019, 11:06 AM

    Hi,
    I have a problem with my Magic Mirror. I just want to update my MM but i can’t because the result of “git pull && npm install” is: (in french)

    Mise à jour de57daa…a31546b
    error: Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :
    config/config.js.sample
    package-lock.json
    vendor/package-lock.json
    Veuillez valider ou remiser vos modifications avant la fusion.
    Abandon

    and with google translate:
    Updated from57daa…a31546b
    error: Your local changes to the following files would be overwritten by the merge:
    config / config.js.sample
    Package-lock.json
    vendor / package-lock.json
    Please validate or postpone your changes before the merge.
    abandonment

    Can anobody tell me the command line to close this error in order to restart git pull?

    Thanks for next answers

    S M 2 Replies Last reply Sep 4, 2019, 12:02 PM Reply Quote 0
    • S Offline
      sdetweil @MisterT
      last edited by Sep 4, 2019, 12:02 PM

      @MisterT said in Update Magic Mirror error:

      Package-lock.json
      vendor / package-lock.json

      you can erase these two files, then will be created

      config/config.js.sample

      git thinks this file was changed, and it should not have been

      so, restore that file from the local repo

      cd ~/MagicMirror
      git checkout -- config/config.js.sample
      

      then try again,

      I have been working on a new script to do upgrades, to help avoid these problems…
      i’d be interested in your experience if u could try it…

      see
      https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing

      Sam

      How to add modules

      learning how to use browser developers window for css changes

      1 Reply Last reply Reply Quote 0
      • M Offline
        mumblebaj Module Developer @MisterT
        last edited by Sep 4, 2019, 4:16 PM

        @MisterT You could also just do a git reset --hard and then git pull $$ npm install. I have had this issue every time I had to update my mirror.

        Check out my modules at: https://github.com/mumblebaj?tab=repositories

        1 Reply Last reply Reply Quote 0
        • M Offline
          MisterT
          last edited by Sep 4, 2019, 5:02 PM

          hi,
          sdetweil: i try your solution:

          cd ~/MagicMirror
          git checkout – config/config.js.sample

          but i have the same problem. git pull said me the same thing. Have you a other idea?

          mumblebaj: if y use this command line, all my modules and config will be deleted? if i copy my modules folder and config folder and paste them in the new version of Magic mirror, everything will work fine?

          Thanks

          M S 2 Replies Last reply Sep 4, 2019, 5:03 PM Reply Quote 0
          • M Offline
            mumblebaj Module Developer @MisterT
            last edited by Sep 4, 2019, 5:03 PM

            @MisterT You will not lose your modules and configs.

            Check out my modules at: https://github.com/mumblebaj?tab=repositories

            1 Reply Last reply Reply Quote 0
            • S Offline
              sdetweil @MisterT
              last edited by Sep 4, 2019, 6:15 PM

              @MisterT notice my post had 2 - in front of filename. Yours appears only to have one

              Sam

              How to add modules

              learning how to use browser developers window for css changes

              1 Reply Last reply Reply Quote 0
              • M Offline
                MisterT
                last edited by Sep 5, 2019, 10:38 AM

                thanks @mumblebaj you’re awesome !!!. Git reset --hard work fine
                Update MM2.8 is ok.

                M 1 Reply Last reply Sep 5, 2019, 1:57 PM Reply Quote 0
                • M Offline
                  mumblebaj Module Developer @MisterT
                  last edited by Sep 5, 2019, 1:57 PM

                  @MisterT Great it worked for you. Please mark the post as Resolved if you are happy that it worked.

                  Check out my modules at: https://github.com/mumblebaj?tab=repositories

                  1 Reply Last reply Reply Quote 0
                  • 1 / 1
                  1 / 1
                  • First post
                    5/8
                    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