On Sat, Oct 16, 2010 at 2:20 PM, Charles R Harris <[email protected] > wrote:
> > > On Sat, Oct 16, 2010 at 12:56 PM, Joshua Holbrook <[email protected] > > wrote: > >> On Sat, Oct 16, 2010 at 10:53 AM, Charles R Harris >> <[email protected]> wrote: >> > Here. This looks harmless but it makes the history really ugly. We need >> to >> > get the word out *not* to do things this way. >> > >> > Chuck >> > >> > _______________________________________________ >> > NumPy-Discussion mailing list >> > [email protected] >> > http://mail.scipy.org/mailman/listinfo/numpy-discussion >> > >> > >> >> So: Rebase, not merge? >> >> > I'm thinking along those lines, but I'm just a dilettante git user. I tend > to merge master to my development branches, merge them back to master, and > then push master to github. That probably isn't the recommended way. Rebase > would probably have the same effect. > > Chuck > > > I think the iPython development mailing list recently had a long discussion about proper git usage. Maybe there is something we can learn from their experience? Ben Root
_______________________________________________ NumPy-Discussion mailing list [email protected] http://mail.scipy.org/mailman/listinfo/numpy-discussion
