<div dir="ltr">Ok, I agree. My history and flubs don't belong in our collective history. I don't think rebasing my branch on an up to date master, gets rid of all the mistakes I made during role development.<div><br>
</div><div>But a thing I can try is to copy off a completed role (but not the hidden git index) to a place outside the local git repo, make a new branch off of master and check it out. Then copy back in the completed role, commit, and then create the PR on the new branch. All the real (painful) history goes away when I delete the old branch.</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jun 12, 2014 at 11:30 PM, Tim Moody <span dir="ltr"><<a href="mailto:tim@timmoody.com" target="_blank">tim@timmoody.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">
<div dir="ltr">
<div style="FONT-SIZE:12pt;FONT-FAMILY:'Calibri';COLOR:#000000">
<div>My impression is that PRs are always against a branch on our personal
repos. They are public in the sense that anyone can read them, but private
in that only we can write to them. Private repos for both read and write
cost money. So the link I put in the agenda was just what the eventual PR
will be.</div>
<div> </div>
<div>I raised the problem with history back when we all agreed to rebase our
person branches before creating PRs. But I am now convinced that it is the
only way to go as otherwise things can get very messy. Basically rebasing
guarantees that our personal changes are placed after the commits to master in
the upstream repo. I am also less interested in the commit history because
we have way too much of it and seldom go back to it.</div>
<div> </div>
<div style="FONT-SIZE:12pt;FONT-FAMILY:'Calibri';COLOR:#000000">Tim</div>
<div style="FONT-SIZE:small;TEXT-DECORATION:none;FONT-FAMILY:"Calibri";FONT-WEIGHT:normal;COLOR:#000000;FONT-STYLE:normal;DISPLAY:inline">
<div style="FONT:10pt tahoma">
<div> </div>
<div style="BACKGROUND:#f5f5f5">
<div><b>From:</b> <a title="georgejhunt@gmail.com" href="mailto:georgejhunt@gmail.com" target="_blank">George Hunt</a> </div>
<div><b>Sent:</b> Thursday, June 12, 2014 9:25 PM</div>
<div><b>To:</b> <a title="tim@timmoody.com" href="mailto:tim@timmoody.com" target="_blank">Tim
Moody</a> ; <a title="curtathompson@gmail.com" href="mailto:curtathompson@gmail.com" target="_blank">Curt Thompson</a> ; <a title="me@jvonau.ca" href="mailto:me@jvonau.ca" target="_blank">Jerry Vonau</a> </div>
<div><b>Cc:</b> <a title="xsce-devel@googlegroups.com" href="mailto:xsce-devel@googlegroups.com" target="_blank">xsce-devel</a> </div>
<div><b>Subject:</b> workflow</div></div></div>
<div> </div></div><div><div class="h5">
<div style="FONT-SIZE:small;TEXT-DECORATION:none;FONT-FAMILY:"Calibri";FONT-WEIGHT:normal;COLOR:#000000;FONT-STYLE:normal;DISPLAY:inline">
<div dir="ltr">I bought a book about git.
<div> </div>
<div>I'm particularly interested in prettying up my commit history. I've
been using my github account to move code I edit on my laptop to my test xo, and
2/3 of the changes are fixing logic errors or typos.</div>
<div> </div>
<div>I read that one should not rebase (and thereby edit the history) if
anyone else is likely to (want to) pull or push to the public repo.</div>
<div> </div>
<div>I noticed that Tim pointed people to his personal repo for testing his
reorganization in the google doc this morning.</div>
<div> </div>
<div>My question: Is our personal clone of xsce on github public or
private?</div>
<div> </div>
<div>I think we can go either way. But I think it would be better if we agreed,
and knew more than I do about the implications of either
choice.</div></div></div></div></div></div></div></div>
</blockquote></div><br></div>