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.

    Update

    Scheduled Pinned Locked Moved Solved Troubleshooting
    10 Posts 3 Posters 5.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.
    • Z Offline
      zkab
      last edited by yawns

      How can this be fixed ? Not an expert on git …

      pi@mirror:~/MagicMirror $ git pull && npm install
      D	19820
      M	css/custom.css
      M	css/custom.css.org
      U	modules/default/currentweather/currentweather.js
      Pull is not possible because you have unmerged files.
      Please, fix them up in the work tree, and then use 'git add/rm '
      as appropriate to mark resolution, or use 'git commit -a'.
      pi@mirror:~/MagicMirror $
      
      1 Reply Last reply Reply Quote 0
      • Z Offline
        zkab
        last edited by yawns

        OK - I went to ~/MagicMirror directory and fired the gun …

        pi@mirror:~/MagicMirror $ git stash
        Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
        HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
        pi@mirror:~/MagicMirror $ git pull && npm install
        remote: Counting objects: 70, done.
        remote: Compressing objects: 100% (24/24), done.
        remote: Total 70 (delta 38), reused 52 (delta 33), pack-reused 13
        Unpacking objects: 100% (70/70), done.
        From https://github.com/MichMich/MagicMirror
           8893df1..86ae704  develop    -> origin/develop
        Already up-to-date.
        
        > magicmirror@2.1.2 install /home/pi/MagicMirror
        > cd vendor && npm install
        
        
        > magicmirror@2.1.2 postinstall /home/pi/MagicMirror
        > sh installers/postinstall/postinstall.sh
        
        MagicMirror installation successful!
        npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.
        pi@mirror:~/MagicMirror $ git stash apply
        On branch master
        Your branch is ahead of 'origin/master' by 4 commits.
          (use "git push" to publish your local commits)
        Changes not staged for commit: ~/MagicMirror
          (use "git add ..." to update what will be committed)
          (use "git checkout -- ..." to discard changes in working directory)
        
        	modified:   css/custom.css
        	modified:   modules/default/currentweather/currentweather.js
        
        Untracked files:
          (use "git add ..." to include in what will be committed)
        
        	css/custom.css.leo
        	fonts/my_fonts/
        
        no changes added to commit (use "git add" and/or "git commit -a")
        pi@mirror:~/MagicMirror $
        
        1 Reply Last reply Reply Quote 0
        • S Offline
          shbatm Module Developer
          last edited by

          It looks like you’ve made some changes to the currentweather modules’ source code.

          If you want to keep your changes - this should do it

          git stash
          git pull && npm install
          git stash apply
          

          If you don’t need your changes to that file:

          git checkout -- modules/default/currentweather/currentweather.js
          git pull && npm install
          
          1 Reply Last reply Reply Quote 2
          • Z Offline
            zkab
            last edited by yawns

            Thanks for your reply.
            It failed already on the first command …

            pi@mirror:~/MagicMirror $ git stash
            modules/default/currentweather/currentweather.js: needs merge
            modules/default/currentweather/currentweather.js: needs merge
            modules/default/currentweather/currentweather.js: unmerged (73774c3dcc4a780ac9c42142224ab3bbb65e1a3d)
            modules/default/currentweather/currentweather.js: unmerged (050917657a61f6edc56195e8f502ff2c67a322e2)
            modules/default/currentweather/currentweather.js: unmerged (ff34891ca2036ea844e0d4f511a551593cbbdd52)
            fatal: git-write-tree: error building trees
            Cannot save the current index state
            pi@mirror:~/MagicMirror $
            
            1 Reply Last reply Reply Quote 0
            • S Offline
              shbatm Module Developer
              last edited by

              @zkab If you know what changes you made to that file, it’s easier to do the second option above and then redo your changes. If you must try to keep your changes as is, try git reset --merge first and then the git stash sequence above, otherwise you can manually edit the file and look for the conflicts.

              Google, “git resolve failed merge” for what you’re looking for, or see below for an excerpt.

              1 Reply Last reply Reply Quote 0
              • Z Offline
                zkab
                last edited by yawns

                OK - what I did before I read you answer was … made a copy of my changes and issued ‘git reset --hard’ … and copied back the changed moduled and after that following:

                git stash
                git pull && npm install
                git stash apply
                but got some warnings … how do I get rid of this …

                1. no such file or directory, open '/home/pi/MagicMirror/modules/package.json - this is not anything I have done
                2. what about Changes not staged for commit and Untracked files
                pi@mirror:~/MagicMirror/modules/default/currentweather $ git stash
                Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
                HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
                pi@mirror:~/MagicMirror/modules/default/currentweather $ git pull && npm install
                Already up-to-date.
                npm WARN enoent ENOENT: no such file or directory, open '/home/pi/MagicMirror/modules/package.json'
                npm WARN enoent ENOENT: no such file or directory, open '/home/pi/MagicMirror/modules/node_modules/node_helper/package.json'
                npm WARN modules No description
                npm WARN modules No repository field.
                npm WARN modules No README data
                npm WARN modules No license field.
                pi@mirror:~/MagicMirror/modules/default/currentweather $ git stash apply
                On branch master
                Your branch is ahead of 'origin/master' by 4 commits.
                  (use "git push" to publish your local commits)
                Changes not staged for commit:
                  (use "git add ..." to update what will be committed)
                  (use "git checkout -- ..." to discard changes in working directory)
                
                	modified:   ../../../css/custom.css
                	modified:   currentweather.js
                
                Untracked files:
                  (use "git add ..." to include in what will be committed)
                
                	../../../css/custom.css.leo
                	../../../fonts/my_fonts/
                
                no changes added to commit (use "git add" and/or "git commit -a")
                pi@mirror:~/MagicMirror/modules/default/currentweather $
                

                Still confused but at a higher level …

                1 Reply Last reply Reply Quote 0
                • S Offline
                  shbatm Module Developer
                  last edited by

                  pi@mirror:~/MagicMirror/modules/default/currentweather $ git pull && npm install

                  Make sure you’re in the ~/MagicMirror directory before running the command.

                  what about Changes not staged for commit and Untracked files

                  Ignore them. For your purposes, you don’t need to worry about them as long as all the merge errors are gone.

                  1 Reply Last reply Reply Quote 0
                  • Z Offline
                    zkab
                    last edited by yawns

                    OK - I went to ~/MagicMirror directory and fired the gun …

                    pi@mirror:~/MagicMirror $ git stash
                    Saved working directory and index state WIP on master: 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
                    HEAD is now at 5e622ca Merge branch 'master' of https://github.com/MichMich/MagicMirror
                    pi@mirror:~/MagicMirror $ git pull && npm install
                    remote: Counting objects: 70, done.
                    remote: Compressing objects: 100% (24/24), done.
                    remote: Total 70 (delta 38), reused 52 (delta 33), pack-reused 13
                    Unpacking objects: 100% (70/70), done.
                    From https://github.com/MichMich/MagicMirror
                       8893df1..86ae704  develop    -> origin/develop
                    Already up-to-date.
                    
                    > magicmirror@2.1.2 install /home/pi/MagicMirror
                    > cd vendor && npm install
                    
                    
                    > magicmirror@2.1.2 postinstall /home/pi/MagicMirror
                    > sh installers/postinstall/postinstall.sh
                    
                    MagicMirror installation successful!
                    npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.
                    pi@mirror:~/MagicMirror $ git stash apply
                    On branch master
                    Your branch is ahead of 'origin/master' by 4 commits.
                      (use "git push" to publish your local commits)
                    Changes not staged for commit: ~/MagicMirror
                      (use "git add ..." to update what will be committed)
                      (use "git checkout -- ..." to discard changes in working directory)
                    
                    	modified:   css/custom.css
                    	modified:   modules/default/currentweather/currentweather.js
                    
                    Untracked files:
                      (use "git add ..." to include in what will be committed)
                    
                    	css/custom.css.leo
                    	fonts/my_fonts/
                    
                    no changes added to commit (use "git add" and/or "git commit -a")
                    pi@mirror:~/MagicMirror $
                    
                    1 Reply Last reply Reply Quote 0
                    • S Offline
                      shbatm Module Developer
                      last edited by

                      @zkab Looks like everything worked to me for what you’re trying to do.

                      1 Reply Last reply Reply Quote 0
                      • bheplerB Offline
                        bhepler Module Developer
                        last edited by

                        Please use the Markdown features to post code and console output. It makes it so much easier to read.

                        1 Reply Last reply Reply Quote 1
                        • Z Offline
                          zkab
                          last edited by

                          OK and thanks for your support …

                          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