<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Try to update a module]]></title><description><![CDATA[<p dir="auto">HI</p>
<p dir="auto">when i try to update a module ‘MMM-Traffic’<br />
i go in cd MagicMirror/modules/MMM-Traffic<br />
and i do ‘git pull’<br />
i have a message :<br />
error: your local changes to the following files would be overwritten by merge: MMM-Taffic.js<br />
please, commit your changes or stash them before you can merge.<br />
Aborting</p>
<p dir="auto">why ?<br />
thanks.</p>
]]></description><link>https://forum.magicmirror.builders/topic/2043/try-to-update-a-module</link><generator>RSS for Node</generator><lastBuildDate>Mon, 17 Aug 2026 14:16:31 GMT</lastBuildDate><atom:link href="https://forum.magicmirror.builders/topic/2043.rss" rel="self" type="application/rss+xml"/><pubDate>Sun, 12 Mar 2017 14:33:13 GMT</pubDate><ttl>60</ttl><item><title><![CDATA[Reply to Try to update a module on Sun, 12 Mar 2017 16:31:11 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/fonfon" aria-label="Profile: Fonfon">@<bdi>Fonfon</bdi></a> - You’re welcome :-)</p>
<p dir="auto">De rien.<br />
Prego.<br />
別客氣.<br />
Bitte.<br />
どういたしまして.<br />
Værsågod.</p>
]]></description><link>https://forum.magicmirror.builders/post/17141</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/17141</guid><dc:creator><![CDATA[Mykle1]]></dc:creator><pubDate>Sun, 12 Mar 2017 16:31:11 GMT</pubDate></item><item><title><![CDATA[Reply to Try to update a module on Sun, 12 Mar 2017 15:28:12 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/mykle1" aria-label="Profile: Mykle1">@<bdi>Mykle1</bdi></a> Thanks again ;) you are right<br />
sometimes when i can’t have a very good english is difficult to understand  …<br />
thanks…</p>
]]></description><link>https://forum.magicmirror.builders/post/17137</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/17137</guid><dc:creator><![CDATA[Fonfon]]></dc:creator><pubDate>Sun, 12 Mar 2017 15:28:12 GMT</pubDate></item><item><title><![CDATA[Reply to Try to update a module on Sun, 12 Mar 2017 14:46:46 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/fonfon" aria-label="Profile: Fonfon">@<bdi>Fonfon</bdi></a> said in <a href="/post/17131">Try to update a module</a>:</p>
<blockquote>
<p dir="auto">error: your local changes to the following files would be overwritten by merge: MMM-Taffic.js<br />
please, commit your changes or stash them before you can merge.</p>
</blockquote>
<p dir="auto">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.</p>
<p dir="auto">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</p>
]]></description><link>https://forum.magicmirror.builders/post/17133</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/17133</guid><dc:creator><![CDATA[Mykle1]]></dc:creator><pubDate>Sun, 12 Mar 2017 14:46:46 GMT</pubDate></item></channel></rss>