<?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[help with updating  MM]]></title><description><![CDATA[<p dir="auto">noob question I’m tring to update my MM but I’m getting errors<br />
error: Your local changes to the following files would be overwritten by merge:<br />
modules/default/calendar/calendar.js<br />
modules/default/currentweather/currentweather.js<br />
modules/default/weatherforecast/weatherforecast.js<br />
Please, commit your changes or stash them before you can merge.<br />
Aborting<br />
I’m not sure what if anything i changed so how can fix?   also what is meant by slashing  just putting / around the lines / ?</p>
]]></description><link>https://forum.magicmirror.builders/topic/4698/help-with-updating-mm</link><generator>RSS for Node</generator><lastBuildDate>Wed, 17 Jun 2026 23:17:15 GMT</lastBuildDate><atom:link href="https://forum.magicmirror.builders/topic/4698.rss" rel="self" type="application/rss+xml"/><pubDate>Tue, 22 Aug 2017 16:52:01 GMT</pubDate><ttl>60</ttl><item><title><![CDATA[Reply to help with updating  MM on Wed, 23 Aug 2017 00:03:14 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/snille" aria-label="Profile: Snille">@<bdi>Snille</bdi></a> said in <a href="/post/26899">help with updating MM</a>:</p>
<blockquote>
<p dir="auto">You can also “stash” your changes with git stash -u<br />
Then if you want you can reapply your changes again after updating with git stash pop<br />
Or, you can just “kill” the changes with git clean -f<br />
But then you WILL loose what you have edited in the files for ever!</p>
</blockquote>
<p dir="auto"><strong>"I’m not sure what if anything i changed . . . "</strong></p>
]]></description><link>https://forum.magicmirror.builders/post/26903</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/26903</guid><dc:creator><![CDATA[Mykle1]]></dc:creator><pubDate>Wed, 23 Aug 2017 00:03:14 GMT</pubDate></item><item><title><![CDATA[Reply to help with updating  MM on Tue, 22 Aug 2017 20:54:35 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/sithas" aria-label="Profile: sithas">@<bdi>sithas</bdi></a></p>
<blockquote>
<p dir="auto"><strong>Easiest fix:</strong><br />
Replace those files with their defaults and then run the update.</p>
</blockquote>
<p dir="auto">You can also “stash” your changes with <code>git stash -u</code><br />
Then if you want you can reapply your changes again after updating with <code>git stash pop</code></p>
<p dir="auto">Or, you can just “kill” the changes with <code>git clean -f</code><br />
But then you WILL loose what you have edited in the files for ever!</p>
]]></description><link>https://forum.magicmirror.builders/post/26899</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/26899</guid><dc:creator><![CDATA[Snille]]></dc:creator><pubDate>Tue, 22 Aug 2017 20:54:35 GMT</pubDate></item><item><title><![CDATA[Reply to help with updating  MM on Tue, 22 Aug 2017 20:39:28 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/sithas" aria-label="Profile: sithas">@<bdi>sithas</bdi></a> said in <a href="/post/26884">help with updating MM</a>:</p>
<blockquote>
<p dir="auto">I’m not sure what if anything i changed so how can fix?</p>
</blockquote>
<p dir="auto">The error is telling you that you made changes to these three files:</p>
<pre><code>modules/default/calendar/calendar.js
modules/default/currentweather/currentweather.js
modules/default/weatherforecast/weatherforecast.js
</code></pre>
<p dir="auto">It is also telling you that your changes won’t be saved if you update, so it cancels the update. It’s likely that you changed some options in those files rather than making those changes in the config.js file. It is not recommended that you edit the module files for exactly this reason, unless you absolutely know what you are doing. Only change options in the config.js file.</p>
<p dir="auto"><strong>Easiest fix:</strong><br />
Replace those files with their defaults and then run the update.</p>
]]></description><link>https://forum.magicmirror.builders/post/26897</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/26897</guid><dc:creator><![CDATA[Mykle1]]></dc:creator><pubDate>Tue, 22 Aug 2017 20:39:28 GMT</pubDate></item></channel></rss>