MagicMirror Forum

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

    UNSOLVED error: Pulling is not possible because you have unmerged files.

    Troubleshooting
    2
    39
    2345
    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.
    • S
      sdetweil @DazTypeR last edited by

      @DazTypeR cool, can u try that one more time (without apply) to see if I fixed the line 159 problem

      Sam

      Create a working config
      How to add modules

      1 Reply Last reply Reply Quote 0
      • D
        DazTypeR last edited by

        Just ran it again without the extra logging and a block of the output shows this…

        saving custom.css
        upgrading from version 2.9.0 to 2.9.0
        fetching latest revisions
        bash: line 159: On branch master: command not found
        there are 28 local files that are different than the master repo

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

          @DazTypeR can I beg one more try?

          Sam

          Create a working config
          How to add modules

          1 Reply Last reply Reply Quote 0
          • D
            DazTypeR last edited by

            saving custom.css
            upgrading from version 2.9.0 to 2.9.0
            fetching latest revisions
            bash: line 154: [: missing `]’
            MagicMirror git fetch failed
            restoring custom.css

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

              @DazTypeR one last time

              Sam

              Create a working config
              How to add modules

              1 Reply Last reply Reply Quote 0
              • D
                DazTypeR last edited by

                Nearly…

                saving custom.css
                upgrading from version 2.9.0 to 2.9.0
                fetching latest revisions
                bash: line 161: On branch master: command not found
                there are 28 local files that are different than the master repo

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

                  @DazTypeR ok, last time… hard to see the side effects

                  $(git status 2>&1) >>$logfile
                  

                  that means execute the git status command , and THEN execute the results of THAT , and pass THOSE results to the log

                  what I wanted was

                  git status 2>&1 >>$logfile
                  

                  exec the git status command, and pass ITS results to the log

                  Sam

                  Create a working config
                  How to add modules

                  1 Reply Last reply Reply Quote 0
                  • D
                    DazTypeR last edited by

                    OK nice one, that has come back with no errors or anything. 🙂

                    Guessing I am correct in replying N to the question regarding lock.json files needed to be saved, I have no idea if I need them or not - lol?

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

                      @DazTypeR u should have seen a message

                      	any *-lock.json files do not need to be saved
                      

                      Sam

                      Create a working config
                      How to add modules

                      1 Reply Last reply Reply Quote 0
                      • D
                        DazTypeR last edited by

                        Of course, sorry, my bad, I did read that.

                        So am I OK to run this now with the apply option and it should update me to 2.9.0?

                        Also, on the slim chance this mucks up, I backed up my SD card prioe to doing all this, guess I will be OK to just reflash the card with that backup image?

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