<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></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="">danke für deine Antwort</div><div class=""><br class=""></div><div class="">wenn ich </div><div class="">sud git revert eingebe bekomme ich einen Hinweis damit noch ein Kommando fehlt:</div><div class=""><br class=""></div><div class=""><div style="margin: 0px;" class="">usage: git revert [options] <commit-ish></div><div style="margin: 0px;" class=""> or: git revert <subcommand></div><div style="margin: 0px; min-height: 13px;" class=""><br class=""></div><div style="margin: 0px;" class=""> --quit end revert or cherry-pick sequence</div><div style="margin: 0px;" class=""> --continue resume revert or cherry-pick sequence</div><div style="margin: 0px;" class=""> --abort cancel revert or cherry-pick sequence</div><div style="margin: 0px;" class=""> -n, --no-commit don't automatically commit</div><div style="margin: 0px;" class=""> -e, --edit edit the commit message</div><div style="margin: 0px;" class=""> -s, --signoff add Signed-off-by:</div><div style="margin: 0px;" class=""> -m, --mainline <n> parent number</div><div style="margin: 0px;" class=""> --rerere-autoupdate update the index with reused conflict resolution if possible</div><div style="margin: 0px;" class=""> --strategy <strategy></div><div style="margin: 0px;" class=""> merge strategy</div><div style="margin: 0px;" class=""> -X, --strategy-option <option></div><div style="margin: 0px;" class=""> option for merge strategy</div></div><div style="margin: 0px;" class=""><br class=""></div><div style="margin: 0px;" class="">was soll ich da eingeben?</div><div style="margin: 0px;" class=""><br class=""></div><div style="margin: 0px;" class="">Danke</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><br class=""></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><br class=""></div><div class=""><div><blockquote type="cite" class=""><div class="">Am 17.12.2014 um 20:56 schrieb Andreas Götz <<a href="mailto:cpuidle@gmail.com" class="">cpuidle@gmail.com</a>>:</div><br class="Apple-interchange-newline"><div class=""><meta http-equiv="content-type" content="text/html; charset=utf-8" class=""><div dir="auto" class=""><div class="">Eine lokale Änderung. Du kannst die Datei mit git revert rückgängig machen, dann pullen und wieder composer install.</div><div class=""><br class=""></div><div class="">Viele Grüße, Andreas</div><div class=""><br class=""><br class=""><br class=""></div><div class=""><br class="">Am 17.12.2014 um 20:01 schrieb Daniel Kopf <<a href="mailto:news@spider-wolf.de" class="">news@spider-wolf.de</a>>:<br class=""><br class=""></div><blockquote type="cite" class=""><div class=""><meta http-equiv="Content-Type" content="text/html charset=utf-8" 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></div></blockquote></div></div></blockquote></div><br class=""></div></body></html>