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

Newbie question on updates

Scheduled Pinned Locked Moved Troubleshooting
12 Posts 3 Posters 5.4k 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.
  • C Offline
    ChrisEW @Mykle1
    last edited by Dec 3, 2017, 3:39 AM

    @Mykle1 Yes, I ran git pull while in the MMM-Scrobbler directory and got “error: your local changes to the following files would be overwritten by merge: MMM-Scrobbler.js

    Please commit your changes or stash them before you can merge.
    Aborting”

    M 1 Reply Last reply Dec 3, 2017, 3:45 AM Reply Quote 0
    • M Offline
      Mykle1 Project Sponsor Module Developer @ChrisEW
      last edited by Dec 3, 2017, 3:45 AM

      @ChrisEW said in Newbie question on updates:

      “error: your local changes to the following files would be overwritten by merge: MMM-Scrobbler.js

      Well, you made changes to the MMM-Scrobbler.js, which is not recommended. That is what the error is telling you. So, you won’t be able to update normally.

      Create a working config
      How to add modules

      C 2 Replies Last reply Dec 3, 2017, 3:55 AM Reply Quote 1
      • C Offline
        ChrisEW @Mykle1
        last edited by Dec 3, 2017, 3:55 AM

        @Mykle1 I did? I don’t remember doing that. I guess I’ll have to either start over, or examine the file. Thank you.

        1 Reply Last reply Reply Quote 0
        • I Offline
          izanbard
          last edited by Dec 4, 2017, 12:05 PM

          I added a script to this topic that should see you covered:

          https://forum.magicmirror.builders/topic/361/how-to-update/12?page=2

          1 Reply Last reply Reply Quote 0
          • C Offline
            ChrisEW @Mykle1
            last edited by Dec 4, 2017, 6:25 PM

            @Mykle1 I looked over the file, and honestly I am not good enough to be modifying files, believe me. I did notice in the MMM-Scobbler file that my username and API key appear there. I really cant remember entering this info there, but I do recall entering this in the main config.js file. Do these two parameters automatically get transferred over to the Scrobbler file?

            M 1 Reply Last reply Dec 4, 2017, 8:17 PM Reply Quote 0
            • M Offline
              Mykle1 Project Sponsor Module Developer @ChrisEW
              last edited by Dec 4, 2017, 8:17 PM

              @ChrisEW

              No, they don’t automatically get transferred from one to the other so perhaps you entered them into the js file and don’t remember. In any case, this is enough for the update not to work.

              Try this. Rename the Scrobbler.js file to something else, then in your terminal run git pull in the MMM-Scrobbler directory. That should update it unless something else was changed

              Create a working config
              How to add modules

              C 1 Reply Last reply Dec 5, 2017, 2:46 AM Reply Quote 1
              • C Offline
                ChrisEW @Mykle1
                last edited by Dec 5, 2017, 2:46 AM

                @Mykle1 Thanks very much. I did this and git pull downloaded a brand new Scrobbler.js file. I’ve left the username and API Key areas as is. Works fine, so far no messages!

                M 1 Reply Last reply Dec 5, 2017, 2:49 AM Reply Quote 1
                • M Offline
                  Mykle1 Project Sponsor Module Developer @ChrisEW
                  last edited by Dec 5, 2017, 2:49 AM

                  @ChrisEW said in Newbie question on updates:

                  Thanks very much

                  You’re welcome. So, in the future, ask a question in a topic before you go changing anything in the module files. :-)

                  Create a working config
                  How to add modules

                  1 Reply Last reply Reply Quote 0
                  • 1
                  • 2
                  • 1 / 2
                  1 / 2
                  • First post
                    9/12
                    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