<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div>I often sit on unrelated uncommitted changes. </div><div><br></div><div>I know it is somewhat risky & somewhat historical, since local branches commit is now available & cheap. But if I commit...I have to go back & remember what is unfinished? Maybe I just use one branch & anything in it different than main is unfinished?</div><div> </div><div><br></div><div>I try not to commit unless in somewhat decent shape. Not just to save so I can pull/merge. </div><div><br></div><div>I guess I'll have to learn the new ways.</div><div><br> - Jay</div><div><br>On Sep 1, 2015, at 4:35 PM, Antony Hosking <<a href="mailto:hosking@purdue.edu">hosking@purdue.edu</a>> wrote:<br><br></div><blockquote type="cite"><div><meta http-equiv="Content-Type" content="text/html charset=utf-8">Yes, commit locally but don’t push just yet.<div class="">Then pull —rebase.<br class=""><div class=""><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 2 Sep 2015, at 2:42 am, Olaf Wagner <<a href="mailto:wagner@elegosoft.com" class="">wagner@elegosoft.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">On Tue, 1 Sep 2015 16:25:05 +0000</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Jay K <</span><a href="mailto:jay.krell@cornell.edu" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">jay.krell@cornell.edu</a><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">> wrote:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">$ git pull --rebaseerror: Cannot pull with rebase: You have unstaged changes.<br class="">Ugh.<br class=""></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Just commit them before you pull.</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Olaf</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">- Jay<br class=""><br class=""><br class="">Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals<br class="">From: <a href="mailto:hosking@purdue.edu" class="">hosking@purdue.edu</a><br class="">Date: Tue, 1 Sep 2015 21:56:30 +1000<br class="">CC: <a href="mailto:jay.krell@cornell.edu" class="">jay.krell@cornell.edu</a>; <a href="mailto:m3commit@elegosoft.com" class="">m3commit@elegosoft.com</a><br class="">To: <a href="mailto:wagner@elego.de" class="">wagner@elego.de</a><br class=""><br class="">I think I’ve managed to rebase things.<br class="">Reminder: when pulling please use "git pull —rebase" to maintain a linear history.<br class="">Tony<br class="">On 1 Sep 2015, at 9:35 pm, Olaf Wagner <<a href="mailto:wagner@elego.de" class="">wagner@elego.de</a>> wrote:On Tue, 1 Sep 2015 21:11:42 +1000Antony Hosking <<a href="mailto:hosking@purdue.edu" class="">hosking@purdue.edu</a>> wrote:Yep, Jay, the document Olaf refers to describes the problem.<br class="">I’m not sure what the remedy is but will explore.<br class="">One standard problem ist that there are both local changesand upstream changes.Then it is problematic to just call 'git merge' or 'git pull'.What should be done instead is to commit the local changesand then use 'git pull --rebase'.At least this was what solved it for me most of the time.OlafOn 1 Sep 2015, at 6:44 pm, Olaf Wagner <<a href="mailto:wagner@elego.de" class="">wagner@elego.de</a>> wrote:<br class=""><br class="">On Tue, 1 Sep 2015 07:15:32 +0000<br class="">Jay K <<a href="mailto:jay.krell@cornell.edu" class="">jay.krell@cornell.edu</a>> wrote:<br class=""><br class="">Just git push, git pull, git commit.<br class="">- Jay<br class=""><br class=""><br class=""><br class="">Subject: Re: [M3commit] [modula3/cm3] 4537cb: remove unused locals<br class="">From: <a href="mailto:hosking@purdue.edu" class="">hosking@purdue.edu</a><br class="">Date: Tue, 1 Sep 2015 16:58:47 +1000<br class="">CC: <a href="mailto:m3commit@elegosoft.com" class="">m3commit@elegosoft.com</a><br class="">To: <a href="mailto:jay.krell@cornell.edu" class="">jay.krell@cornell.edu</a><br class=""><br class="">Jay, it appears that your commits are still messing up the history.<br class="">As of your most recent commit we have lost history again. What exactly are you doing when you use git against the repo?<br class=""><br class="">Usually history is never really _lost_ in git, just hidden ;-)<br class="">A possible explanation is that the first and second parent get<br class="">switched due to merges. This link gives a good explanation of<br class="">what is often the reason:<br class=""><br class=""><a href="http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git" class="">http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git</a><br class=""><br class="">You should bear in mind that git is really more like a tree<br class="">management software than a traditional version control system.<br class="">You can do almost anything with it, especially shoot your own foot.<br class=""><br class="">Olaf<br class="">--<span class="Apple-converted-space"> </span><br class="">Olaf Wagner -- elego Software Solutions GmbH -- <a href="http://www.elegosoft.com">http://www.elegosoft.com</a><span class="Apple-converted-space"> </span><br class=""> Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany<br class="">phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95<br class="">Geschäftsführer: Olaf Wagner | Sitz: Berlin<br class="">Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194<br class=""><br class="">-- Olaf Wagner -- elego Software Solutions GmbH -- <a href="http://www.elegosoft.com">http://www.elegosoft.com</a> Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germanyphone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95Geschäftsführer: Olaf Wagner | Sitz: BerlinHandelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span> <span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-converted-space"> </span> <br class=""></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">--<span class="Apple-converted-space"> </span></span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Olaf Wagner -- elego Software Solutions GmbH --<span class="Apple-converted-space"> </span></span><a href="http://www.elegosoft.com/" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">http://www.elegosoft.com</a><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class=""> </span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class=""> Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Geschäftsführer: Olaf Wagner | Sitz: Berlin</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194</span></div></blockquote></div><br class=""></div></div></div></div></blockquote></body></html>