Navigation

    MagicMirror Forum

    • Register
    • Login
    • Search
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • Donate
    • Discord

    Newbie question on updates

    Troubleshooting
    3
    12
    2920
    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
      ChrisEW last edited by

      Successfully running Scrobbler for Spotify listening, but getting msg on the header that I’m “2 commits behind on the master branch”…how to fix/update?

      Mykle1 1 Reply Last reply Reply Quote 0
      • Mykle1
        Mykle1 Project Sponsor Module Developer @ChrisEW last edited by

        @ChrisEW

        Normally, you would navigate to the directory in your terminal and run git pull. If you’re talking about the MM software itself then you likely have to run npm install after that, as well.

        C 1 Reply Last reply Reply Quote 0
        • C
          ChrisEW @Mykle1 last edited by

          @Mykle1 Ran both, still getting the ‘Update available’ message at the top of my screen This is specific to MMM-Scrobbler of course.

          Mykle1 1 Reply Last reply Reply Quote 0
          • Mykle1
            Mykle1 Project Sponsor Module Developer @ChrisEW last edited by

            @ChrisEW

            Just to clarify, you ran git pull and npm install in the MagicMirror/modules/MMM-Scrobbler directory and the update message is about Scrobbler?

            C 1 Reply Last reply Reply Quote 0
            • C
              ChrisEW @Mykle1 last edited by

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

              Mykle1 1 Reply Last reply Reply Quote 0
              • Mykle1
                Mykle1 Project Sponsor Module Developer @ChrisEW last edited by

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

                C 2 Replies Last reply Reply Quote 1
                • C
                  ChrisEW @Mykle1 last edited by

                  @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
                    izanbard last edited by

                    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
                      ChrisEW @Mykle1 last edited by

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

                      Mykle1 1 Reply Last reply Reply Quote 0
                      • Mykle1
                        Mykle1 Project Sponsor Module Developer @ChrisEW last edited by

                        @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

                        C 1 Reply Last reply Reply Quote 1
                        • 1
                        • 2
                        • 1 / 2
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Paul-Vincent Roll and Rodrigo Ramírez Norambuena.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy