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

Getting an error on update

Scheduled Pinned Locked Moved Solved Troubleshooting
4 Posts 3 Posters 924 Views 3 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.
  • C Offline
    CliffordW
    last edited by Jul 2, 2019, 3:29 PM

    I enter

    git pull && npm install

    I am seeing this error:

    error: Your local changes to the following files would be overwritten by merge:
    package-lock.json
    package.jso
    Please commit your changes or stash them before you merge.

    I am a noob with git. What should I do to complete the update?

    M 1 Reply Last reply Jul 2, 2019, 3:35 PM Reply Quote 0
    • M Online
      mumblebaj Module Developer @CliffordW
      last edited by Jul 2, 2019, 3:35 PM

      @CliffordW From within the MagicMirror folder do the following:

      git reset --hard
      

      Then do

      git pull && npm install
      

      That should solve your problem

      Check out my modules at: https://github.com/mumblebaj?tab=repositories

      C 1 Reply Last reply Jul 2, 2019, 4:20 PM Reply Quote 0
      • C Offline
        CliffordW @mumblebaj
        last edited by Jul 2, 2019, 4:20 PM

        @mumblebaj Thanks!

        1 Reply Last reply Reply Quote 0
        • S Offline
          swvalenti Project Sponsor
          last edited by Jul 2, 2019, 5:42 PM

          I just removed those files out of MagicMirror by adding them to the desktop and ran the commands with no issue as well.

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