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

MMM-carousel stuck with update

Scheduled Pinned Locked Moved Solved Troubleshooting
4 Posts 2 Posters 237 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.
  • J Offline
    JMac
    last edited by Feb 4, 2025, 7:56 PM

    I’m getting this error when running the latest update,
    MagicMirror@raspberrypi:~/MagicMirror/modules/MMM-Carousel $ git pull
    hint: Pulling without specifying how to reconcile divergent branches is
    hint: discouraged. You can squelch this message by running one of the following
    hint: commands sometime before your next pull:
    hint:
    hint: git config pull.rebase false # merge (the default strategy)
    hint: git config pull.rebase true # rebase
    hint: git config pull.ff only # fast-forward only
    hint:
    hint: You can replace “git config” with “git config --global” to set a default
    hint: preference for all repositories. You can also pass --rebase, --no-rebase,
    hint: or --ff-only on the command line to override the configured default per
    hint: invocation.
    Updating fb51858…f14e5e9
    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.
    Aborting

    I’ve tried - git reset package-lock.json

    as was recommended with a similar issue with MMM-CalendarEXT3 but this isn’t offering any steps forward.
    Any thoughts?
    Cheers.

    S 1 Reply Last reply Feb 4, 2025, 8:54 PM Reply Quote 0
    • S Away
      sdetweil @JMac
      last edited by sdetweil Feb 6, 2025, 2:15 PM Feb 4, 2025, 8:54 PM

      @JMac just
      rm package-lock.json

      then the git pull should work

      Sam

      How to add modules

      learning how to use browser developers window for css changes

      J 1 Reply Last reply Feb 6, 2025, 4:53 PM Reply Quote 0
      • J Offline
        JMac @sdetweil
        last edited by Feb 6, 2025, 4:53 PM

        @sdetweil Sorry for the late response, That’s done the job.
        If I get the package-lock.json during any other update, will this work to allow the update to continue?

        S 1 Reply Last reply Feb 6, 2025, 5:12 PM Reply Quote 0
        • S Away
          sdetweil @JMac
          last edited by Feb 6, 2025, 5:12 PM

          @JMac yes

          Sam

          How to add modules

          learning how to use browser developers window for css changes

          1 Reply Last reply Reply Quote 0
          • S sdetweil has marked this topic as solved on Feb 7, 2025, 2:01 PM
          • 1 / 1
          1 / 1
          • First post
            3/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