[Numpy-discussion] Another merge at github

Charles R Harris charlesr.harris@gmail....
Sat Oct 16 17:23:19 CDT 2010


On Sat, Oct 16, 2010 at 3:54 PM, Benjamin Root <ben.root@ou.edu> wrote:

> On Sat, Oct 16, 2010 at 2:20 PM, Charles R Harris <
> charlesr.harris@gmail.com> wrote:
>
>>
>>
>> On Sat, Oct 16, 2010 at 12:56 PM, Joshua Holbrook <
>> josh.holbrook@gmail.com> wrote:
>>
>>> On Sat, Oct 16, 2010 at 10:53 AM, Charles R Harris
>>> <charlesr.harris@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@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?
>
>
IIRC, they recommended pushing from local branches to master on github and
not merging master to the development branches. That doesn't sound right to
me, but perhaps I misunderstood...

Chuck
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.scipy.org/pipermail/numpy-discussion/attachments/20101016/ac0cc0b5/attachment-0001.html 


More information about the NumPy-Discussion mailing list