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

Problem to update

Scheduled Pinned Locked Moved Troubleshooting
3 Posts 2 Posters 1.6k 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.
  • G Offline
    greda
    last edited by Apr 20, 2018, 9:03 PM

    Hello Everybody,

    I ve got a message on my miroir :
    the current installation is 149 commits late on the master branch

    I try to make update with this command : sudo git pull && npm install in the folder MagiMirror/module but i ve got this message : error: Your local changes to the following files would be overwritten by merge : modules/default/compliments/compliments.js
    Please, commit your changes or stash them before you can merge.
    Aborting
    Thank you for your helping.

    1 Reply Last reply Reply Quote 0
    • A Offline
      AxLed Module Developer
      last edited by Apr 21, 2018, 9:52 AM

      Hi greda,

      if you dont need the changes anymore:
      change in the directory (modules/default/compliments in your case)

      git reset --hard
      
      git pull origin master
      

      After this, try to update again, you should get further with your update.

      Regards AxLED

      1 Reply Last reply Reply Quote 0
      • G Offline
        greda
        last edited by Apr 21, 2018, 9:07 PM

        Hi AxLED

        Thank you so much nom i ve got update on my MagicMirror.

        Regards Greda

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