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.

    New MagicMirror Version

    Scheduled Pinned Locked Moved Troubleshooting
    7 Posts 2 Posters 2.3k 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.
    • O Offline
      ostfilinchen
      last edited by

      Hi all,

      If I try tu update via git pull, I get this error Message:

      pi@raspberrypi:~/MagicMirror $ git pull
      Entferne tests/unit/translations/same_keys.js
      Entferne tests/unit/functions/class_spec.js
      automatischer Merge von modules/default/currentweather/README.md
      KONFLIKT (Inhalt): Merge-Konflikt in modules/default/currentweather/README.mdAutomatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen Sie dann das Ergebnis.

      I have deleted the Readme file and also do git reset --hard. But nothing helps.

      What can I do to solve the Problem?
      Regards
      Daniel

      N 1 Reply Last reply Reply Quote 0
      • N Offline
        NoNameRo @ostfilinchen
        last edited by NoNameRo

        @ostfilinchen

        what error you get, did you run git pull && npm install

        1 Reply Last reply Reply Quote 0
        • O Offline
          ostfilinchen
          last edited by

          I only do git pull. After this I get the error.

          N 1 Reply Last reply Reply Quote 0
          • N Offline
            NoNameRo @ostfilinchen
            last edited by

            @ostfilinchen
            what is the error after you have deleted the Readme file

            try following

            pm2 stop mm
            

            then

            git pull && npm install
            

            and then

            pm2 restart mm
            
            O 1 Reply Last reply Reply Quote 0
            • O Offline
              ostfilinchen @NoNameRo
              last edited by

              @NoNameRo

              Same error. I had never change the readme.md from the currentweather…

              N 1 Reply Last reply Reply Quote 0
              • N Offline
                NoNameRo @ostfilinchen
                last edited by

                @ostfilinchen
                but you have deleted them, if not then please delete and try again

                1 Reply Last reply Reply Quote 0
                • O Offline
                  ostfilinchen
                  last edited by

                  I don’t know what happens, but now there is no error

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