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

Unable to upgrade MM to 2.27.1

Scheduled Pinned Locked Moved Unsolved Troubleshooting
3 Posts 3 Posters 479 Views 3 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
    Johanba
    last edited by Oct 3, 2021, 8:51 AM

    Hi

    Getting this error
    pi@raspberrypi:~/MagicMirror $ git pull && npm install
    error: Pulling is not possible because you have unmerged files.
    hint: Fix them up in the work tree, and then use ‘git add/rm ’
    hint: as appropriate to mark resolution and make a commit.
    fatal: Exiting because of an unresolved conflict.

    Will appreciate any assistance

    1 Reply Last reply Reply Quote 0
    • D Offline
      DJBOOB66
      last edited by Oct 3, 2021, 8:55 AM

      Try

      cd ~/MagicMirror
      git reset --hard HEAD
      git pull
      npm install
      
      S 1 Reply Last reply Oct 3, 2021, 11:03 AM Reply Quote 0
      • S Away
        sdetweil @DJBOOB66
        last edited by Oct 3, 2021, 11:03 AM

        @djboob66 wait.

        why unmerged files?

        git status

        to see what is going on

        Sam

        How to add modules

        learning how to use browser developers window for css changes

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