[Numpy-discussion] Another merge at github

[Benjamin Root]

On Sat, Oct 16, 2010 at 2:20 PM, Charles R Harris <charlesr.harris at gmail.com
> wrote:

>
>
> On Sat, Oct 16, 2010 at 12:56 PM, Joshua Holbrook <josh.holbrook at gmail.com
> > wrote:
>
>> On Sat, Oct 16, 2010 at 10:53 AM, Charles R Harris
>> <charlesr.harris at gmail.com> 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
>> > NumPy-Discussion at scipy.org
>> > 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/numpy-discussion/attachments/20101016/acfdc912/attachment.html>