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.

    Think I messed up one of my moduless

    Scheduled Pinned Locked Moved Solved Troubleshooting
    3 Posts 2 Posters 375 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.
    • B Offline
      bebetter14
      last edited by

      Hi all,

      I think I messed something up with my CalendarExt3 modules. When I do the git pull to update I receive this error: error: Your local changes to the following files would be overwritten by merge:
      package-lock.json
      Please commit your changes or stash them before you merge.

      Could I have messed something up with the modules config? It’s very possible I did. How would I revert these changes?

      Thank you!

      S 1 Reply Last reply Reply Quote 0
      • S Offline
        sdetweil @bebetter14
        last edited by

        @bebetter14 revert is easier

        in the module folder do

        git checkout package-lock.json
        

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        B 1 Reply Last reply Reply Quote 0
        • B Offline
          bebetter14 @sdetweil
          last edited by

          @sdetweil said in Think I messed up one of my moduless:

          git checkout package-lock.json

          Solved! Thank you so much. I hope you have a great Holiday break!

          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