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

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

Scheduled Pinned Locked Moved Unsolved Troubleshooting
39 Posts 2 Posters 11.5k Views 2 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.
  • S Away
    sdetweil @DazTypeR
    last edited by Nov 2, 2019, 3:50 PM

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

    Sam

    How to add modules

    learning how to use browser developers window for css changes

    1 Reply Last reply Reply Quote 0
    • D Offline
      DazTypeR
      last edited by Nov 2, 2019, 3:53 PM

      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 Nov 2, 2019, 3:57 PM Reply Quote 0
      • S Away
        sdetweil @DazTypeR
        last edited by Nov 2, 2019, 3:57 PM

        @DazTypeR can I beg one more try?

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        1 Reply Last reply Reply Quote 0
        • D Offline
          DazTypeR
          last edited by Nov 2, 2019, 4:07 PM

          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 Nov 2, 2019, 4:09 PM Reply Quote 0
          • S Away
            sdetweil @DazTypeR
            last edited by Nov 2, 2019, 4:09 PM

            @DazTypeR one last time

            Sam

            How to add modules

            learning how to use browser developers window for css changes

            1 Reply Last reply Reply Quote 0
            • D Offline
              DazTypeR
              last edited by Nov 2, 2019, 4:11 PM

              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 Nov 2, 2019, 4:15 PM Reply Quote 0
              • S Away
                sdetweil @DazTypeR
                last edited by sdetweil Nov 2, 2019, 4:17 PM Nov 2, 2019, 4:15 PM

                @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

                How to add modules

                learning how to use browser developers window for css changes

                1 Reply Last reply Reply Quote 0
                • D Offline
                  DazTypeR
                  last edited by Nov 2, 2019, 4:21 PM

                  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 Nov 2, 2019, 4:22 PM Reply Quote 0
                  • S Away
                    sdetweil @DazTypeR
                    last edited by Nov 2, 2019, 4:22 PM

                    @DazTypeR u should have seen a message

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

                    Sam

                    How to add modules

                    learning how to use browser developers window for css changes

                    1 Reply Last reply Reply Quote 0
                    • D Offline
                      DazTypeR
                      last edited by Nov 2, 2019, 4:25 PM

                      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 Nov 2, 2019, 4:26 PM Reply Quote 0
                      • 1
                      • 2
                      • 3
                      • 4
                      • 3 / 4
                      3 / 4
                      • First post
                        24/39
                        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