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

Try to update a module

Scheduled Pinned Locked Moved General Discussion
4 Posts 2 Posters 2.8k 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.
  • F Offline
    Fonfon
    last edited by Mar 12, 2017, 2:33 PM

    HI

    when i try to update a module ‘MMM-Traffic’
    i go in cd MagicMirror/modules/MMM-Traffic
    and i do ‘git pull’
    i have a message :
    error: your local changes to the following files would be overwritten by merge: MMM-Taffic.js
    please, commit your changes or stash them before you can merge.
    Aborting

    why ?
    thanks.

    M 1 Reply Last reply Mar 12, 2017, 2:46 PM Reply Quote 0
    • M Offline
      Mykle1 Project Sponsor Module Developer @Fonfon
      last edited by Mar 12, 2017, 2:46 PM

      @Fonfon said in Try to update a module:

      error: your local changes to the following files would be overwritten by merge: MMM-Taffic.js
      please, commit your changes or stash them before you can merge.

      It would appear that you changed something in the module file, MMM-Traffic.js. So, you can either undo those changes and then do a git pull, or you can delete and re-install the module and then do a git pull.

      Keep in mind, if you delete and re-install the module, the changes you made to the original will be lost. This does not affect your config.js file

      Create a working config
      How to add modules

      F 1 Reply Last reply Mar 12, 2017, 3:28 PM Reply Quote 0
      • F Offline
        Fonfon @Mykle1
        last edited by Mar 12, 2017, 3:28 PM

        @Mykle1 Thanks again ;) you are right
        sometimes when i can’t have a very good english is difficult to understand …
        thanks…

        M 1 Reply Last reply Mar 12, 2017, 4:31 PM Reply Quote 1
        • M Offline
          Mykle1 Project Sponsor Module Developer @Fonfon
          last edited by Mar 12, 2017, 4:31 PM

          @Fonfon - You’re welcome :-)

          De rien.
          Prego.
          別客氣.
          Bitte.
          どういたしまして.
          Værsågod.

          Create a working config
          How to add modules

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