<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"><style type="text/css">body { background: rgba(255, 255, 255, 255); }</style></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hallo,<div class=""><br class=""></div><div class="">wollte mal wieder ein Update machen und habe wie in der Anleitung beschrieben (<a href="http://wiki.volkszaehler.org/howto/raspberry_pi_image?s[]=update" class="">http://wiki.volkszaehler.org/howto/raspberry_pi_image?s[]=update</a>) vorgegange.</div><div class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class=""><br class=""></span></div><div class=""><font color="#00364a" class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class="">sudo apt-get </span><span class="search_hit" style="white-space: pre-wrap; line-height: 1.5em; text-align: justify; background-color: rgb(237, 198, 9);">update</span></font></div><div class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class=""><font color="#00364a" class="">sudo apt-get dist-upgrade</font></span></div><div class=""><font color="#00364a" class=""><span class="search_hit" style="line-height: 1.5em; text-align: justify; background-color: rgb(237, 198, 9);">Update</span><span style="line-height: 1.5em; text-align: justify;" class=""> </span><span style="line-height: 1.5em; text-align: justify;" class="">1wirevz: </span></font></div><div class=""><font color="#00364a" class=""><span style="line-height: 1.5em; text-align: justify; white-space: pre-wrap; background-color: rgb(247, 249, 250);" class="">sudo /usr/local/bin/</span><span class="search_hit" style="line-height: 1.5em; text-align: justify; white-space: pre-wrap; background-color: rgb(237, 198, 9);">update</span><span style="line-height: 1.5em; text-align: justify; white-space: pre-wrap; background-color: rgb(247, 249, 250);" class="">-1wirevz</span></font></div><div class=""><font color="#00364a" class=""><span class="search_hit" style="line-height: 1.5em; text-align: justify; background-color: rgb(237, 198, 9);">Update</span><span style="line-height: 1.5em; text-align: justify;" class=""> </span><span style="line-height: 1.5em; text-align: justify;" class="">s0vz:</span><span style="line-height: 1.5em; text-align: justify;" class=""> </span></font></div><div class=""><font color="#00364a" class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class="">sudo /usr/local/bin/</span><span class="search_hit" style="white-space: pre-wrap; line-height: 1.5em; text-align: justify; background-color: rgb(237, 198, 9);">update</span><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class="">-s0vz</span></font></div><div class=""><span class="search_hit" style="line-height: 1.5em; text-align: justify; background-color: rgb(237, 198, 9);">Update</span><span style="color: rgb(0, 54, 74); line-height: 1.5em; text-align: justify;" class=""> </span><span style="color: rgb(0, 54, 74); line-height: 1.5em; text-align: justify;" class="">Volkszaehler:</span></div><div class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class=""><font color="#00364a" class="">cd /var/www/<a href="http://volkszaehler.org" class="">volkszaehler.org</a></font></span></div><div class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class=""><font color="#00364a" class=""><br class=""></font></span></div><div class=""><span style="white-space: pre-wrap; background-color: rgb(247, 249, 250); line-height: 1.5em; text-align: justify;" class=""><font color="#00364a" class="">wenn ich </font></span></div><div class=""><span style="color: rgb(0, 54, 74); line-height: 1.5em; text-align: justify; white-space: pre-wrap; background-color: rgb(247, 249, 250);" class="">sudo git pull</span></div><div class=""><div class="">eingebe bekomme ich folgende Fehlermeldung:</div></div><div class=""><br class=""></div><div class=""><div style="margin: 0px;" class="">Updating 3600dab..eceaec8</div><div style="margin: 0px;" class="">error: Your local changes to the following files would be overwritten by merge:</div><div style="margin: 0px;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span>composer.lock</div><div style="margin: 0px;" class="">Please, commit your changes or stash them before you can merge.</div><div style="margin: 0px;" class="">Aborting</div></div><div style="margin: 0px;" class=""><br class=""></div><div style="margin: 0px;" class="">Was könnte das sein?</div><div style="margin: 0px;" class=""><br class=""></div><div style="margin: 0px;" class="">Gruß</div><div style="margin: 0px;" class=""><br class=""></div><div style="margin: 0px;" class="">Daniel</div><div style="margin: 0px;" class=""><br class=""></div></body></html>