MagicMirror Forum

    • Register
    • Login
    • Search
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • Donate
    • Discord
    MagicMirror² v2.25.0 is available! For more information about this release, check out this topic.

    UNSOLVED Problem update

    Troubleshooting
    3
    3
    1419
    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
      greda last edited by

      Hello,
      I would like an update but I have the following message:
      Error: Your local changes to the following files will be overwritten:
      modules / default / compliments / compliments.js
      Please validate your changes or store them before you can merge.

      To update, I’m in the MaggicMirror directory and I run the git pull command
      Thanks for your help.

      1 Reply Last reply Reply Quote 0
      • M
        MadScientist last edited by

        It looks like you made changes to your compliments.js. Did you add compliments to the module? It’s generally better to add them to the config.js instead.
        I’d suggest to move your new compliments over to the config.js, undo the changes in the compliments.js and then run the update.

        1 Reply Last reply Reply Quote 1
        • A
          AxLed Module Developer last edited by

          @greda
          If you dont need your changes in your compliment module, you can try following commands (in the folder you are trying to update via git pull)

          git reset --hard
          git pull origin master
          

          Do some post installations (if required).

          AxLED

          1 Reply Last reply Reply Quote 1
          • 1 / 1
          • First post
            Last post
          Enjoying MagicMirror? Please consider a donation!
          MagicMirror created by Michael Teeuw.
          Forum managed by Paul-Vincent Roll and Rodrigo Ramírez Norambuena.
          This forum is using NodeBB as its core | Contributors
          Contact | Privacy Policy