<?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[Can't Update]]></title><description><![CDATA[<p dir="auto">Hi,<br />
Very new to this but getting there.<br />
My mirror works well but I cannot seem to update to the new version.<br />
I get the following error message:</p>
<p dir="auto"><strong>Error:  Your local changes to the following files would be overwritten by merge:<br />
package-lock.json<br />
Please, commit your changes or stash them before you can merge.</strong></p>
<p dir="auto">The thing is, I haven’t touched the file in question.<br />
Any ideas?</p>
<ul>
<li>Dwleo</li>
</ul>
]]></description><link>https://forum.magicmirror.builders/topic/7581/can-t-update</link><generator>RSS for Node</generator><lastBuildDate>Sat, 15 Aug 2026 06:21:33 GMT</lastBuildDate><atom:link href="https://forum.magicmirror.builders/topic/7581.rss" rel="self" type="application/rss+xml"/><pubDate>Wed, 04 Jul 2018 16:47:15 GMT</pubDate><ttl>60</ttl><item><title><![CDATA[Reply to Can't Update on Thu, 05 Jul 2018 00:49:08 GMT]]></title><description><![CDATA[<p dir="auto"><a class="plugin-mentions-user plugin-mentions-a" href="/user/michmich" aria-label="Profile: michmich">@<bdi>michmich</bdi></a> Thasnks  MitchMitch.<br />
That did it.</p>
]]></description><link>https://forum.magicmirror.builders/post/41225</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/41225</guid><dc:creator><![CDATA[dwleo]]></dc:creator><pubDate>Thu, 05 Jul 2018 00:49:08 GMT</pubDate></item><item><title><![CDATA[Reply to Can't Update on Wed, 04 Jul 2018 20:09:43 GMT]]></title><description><![CDATA[<p dir="auto">Run the following command from within the MagicMirror folder, and try again:</p>
<pre><code>git reset --hard; git clean -df;
</code></pre>
]]></description><link>https://forum.magicmirror.builders/post/41213</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/41213</guid><dc:creator><![CDATA[MichMich]]></dc:creator><pubDate>Wed, 04 Jul 2018 20:09:43 GMT</pubDate></item><item><title><![CDATA[Reply to Can't Update on Wed, 04 Jul 2018 19:42:30 GMT]]></title><description><![CDATA[<p dir="auto">I just moved the file into my /home/pi directory then did <code>git pull</code> in mm directory and once I realized it worked fine I just deleted the .json</p>
]]></description><link>https://forum.magicmirror.builders/post/41212</link><guid isPermaLink="true">https://forum.magicmirror.builders/post/41212</guid><dc:creator><![CDATA[meisch23]]></dc:creator><pubDate>Wed, 04 Jul 2018 19:42:30 GMT</pubDate></item></channel></rss>