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.

    Help! Problem updating to v2.3.1

    Scheduled Pinned Locked Moved Troubleshooting
    2 Posts 2 Posters 840 Views 1 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.
    • K Offline
      kullboys
      last edited by

      Hello everyone
      Just tried to update today to v2.3.1 and got the following error when running “git pull” in the ~/MagicMirror directory

      Removing tests/unit/translations/same_keys.js
      Removing tests/unit/functions/class_spec.js
      Auto-merging modules/default/currentweather/README.md
      CONFLICT (content): Merge conflict in modules/default/currentweather/README.md
      Automatic merge failed; fix conflicts and then commit the result.

      Anyone got any ideas as to what I may be doing wrong ? (I’m running 2 mirrors, and both have the same error)
      Thanks.

      MichMichM 1 Reply Last reply Reply Quote 0
      • MichMichM Offline
        MichMich Admin @kullboys
        last edited by

        @kullboys https://forum.magicmirror.builders/topic/7581/can-t-update/4

        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