MagicMirror Forum

    • Register
    • Login
    • Search
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • Donate
    • Discord
    MagicMirror² v2.25.0 is available! For more information about this release, check out this topic.

    SOLVED updating module not possible...need help

    Troubleshooting
    4
    13
    542
    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.
    • Stoffbeuteluwe
      Stoffbeuteluwe Project Sponsor last edited by

      error: Your local changes to the following files would be overwritten by merge:
      	.DS_Store
      Please commit your changes or stash them before you merge.
      Aborting
      
      
      S Assassins 2 Replies Last reply Reply Quote 0
      • Stoffbeuteluwe
        Stoffbeuteluwe Project Sponsor @sdetweil last edited by

        @sdetweil my solution is to delete the module folder and do a new install and that’s it

        thanks to all

        S 1 Reply Last reply Reply Quote 0
        • S
          sdetweil @Stoffbeuteluwe last edited by

          @Stoffbeuteluwe interesting
          this on a Mac?

          rm .DS_store

          then git pull again

          Sam

          Create a working config
          How to add modules

          Stoffbeuteluwe 1 Reply Last reply Reply Quote 0
          • Stoffbeuteluwe
            Stoffbeuteluwe Project Sponsor @sdetweil last edited by

            @sdetweil yes on a mac and on pi too

            S 1 Reply Last reply Reply Quote 0
            • S
              sdetweil @Stoffbeuteluwe last edited by sdetweil

              @Stoffbeuteluwe .DS_Store is a Mac file

              I would guess it was added to the git repo accidentally

              Sam

              Create a working config
              How to add modules

              BKeyport 1 Reply Last reply Reply Quote 0
              • BKeyport
                BKeyport Module Developer @sdetweil last edited by

                Alert the module author so they can work with you to determine if the file is in the repo and have it removed so it don’t cause issues.

                The "E" in "Javascript" stands for "Easy"

                S 1 Reply Last reply Reply Quote 0
                • S
                  sdetweil @BKeyport last edited by

                  @BKeyport it IS in the repo, else u wouldn’t get that error on pull

                  Sam

                  Create a working config
                  How to add modules

                  BKeyport 1 Reply Last reply Reply Quote 0
                  • BKeyport
                    BKeyport Module Developer @sdetweil last edited by

                    @sdetweil doh. you’re right. Silly me. 😉

                    The "E" in "Javascript" stands for "Easy"

                    1 Reply Last reply Reply Quote 0
                    • Assassins
                      Assassins @Stoffbeuteluwe last edited by Assassins

                      @Stoffbeuteluwe
                      I do this on my mac to pi : https://docs.magicmirror.builders/getting-started/upgrade-guide.html
                      and it work

                      S 1 Reply Last reply Reply Quote 0
                      • S
                        sdetweil @Assassins last edited by

                        @Assassins run my upgrade script

                        Sam

                        Create a working config
                        How to add modules

                        Stoffbeuteluwe Assassins 2 Replies Last reply Reply Quote 0
                        • Stoffbeuteluwe
                          Stoffbeuteluwe Project Sponsor @sdetweil last edited by

                          @sdetweil my solution is to delete the module folder and do a new install and that’s it

                          thanks to all

                          S 1 Reply Last reply Reply Quote 0
                          • 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