[scikit-learn] The culture of commit squashing

[Joel Nothman]

Yes, I tried to work that out regarding @afouchet and @tguillemot's work,
but I may have failed to. However, both are credited in what's new, etc...
And commit counts really say little.

On 19 June 2016 at 09:18, Raghav R V <ragvrv at gmail.com> wrote:

> IMHO the squash and merge should not be used when there are commits from 2
> or more different authors to avoid crediting only a single author.
>
> On Tue, Jun 14, 2016 at 6:40 PM, Tom DLT <tom.duprelatour at orange.fr>
> wrote:
>
>> @Andreas
>> It's a bit hidden: You need to click on "Merge pull-request", then do
>> *not* click on "Confirm merge", but on the small arrow to the right, and
>> select "Squash and merge".
>>
>> 2016-06-14 18:13 GMT+02:00 Andreas Mueller <t3kcit at gmail.com>:
>>
>>> I'm +1 for using the button when appropriate.
>>> I think it should be up to the merging person to make a call whether a
>>> squash is a better
>>> logical unit than all the commits.
>>> I would set like a soft limit at ~5 commits or something. If your PR has
>>> more than 5 separate
>>> big logical units, it's probably too big.
>>>
>>> The button is enabled in the settings but I can't see it.
>>> Am I being stupid?
>>>
>>>
>>> On 06/14/2016 06:58 AM, Joel Nothman wrote:
>>>
>>> Sounds good to me. Thank goodness someone reads the documentation!
>>>
>>> On 14 June 2016 at 19:51, Alexandre Gramfort <
>>> alexandre.gramfort at telecom-paristech.fr> wrote:
>>>
>>>> > We could stop squashing during development, and use the new
>>>> Squash-and-Merge
>>>> > button on GitHub.
>>>> > What do you think?
>>>>
>>>> +1
>>>>
>>>> the reason I see for squashing during dev is to avoid killing the
>>>> browser when reviewing. It really rarely happens though.
>>>>
>>>> A
>>>> _______________________________________________
>>>> scikit-learn mailing list
>>>> scikit-learn at python.org
>>>> https://mail.python.org/mailman/listinfo/scikit-learn
>>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> scikit-learn mailing listscikit-learn at python.orghttps://mail.python.org/mailman/listinfo/scikit-learn
>>>
>>>
>>>
>>> _______________________________________________
>>> scikit-learn mailing list
>>> scikit-learn at python.org
>>> https://mail.python.org/mailman/listinfo/scikit-learn
>>>
>>>
>>
>> _______________________________________________
>> scikit-learn mailing list
>> scikit-learn at python.org
>> https://mail.python.org/mailman/listinfo/scikit-learn
>>
>>
>
> _______________________________________________
> scikit-learn mailing list
> scikit-learn at python.org
> https://mail.python.org/mailman/listinfo/scikit-learn
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/scikit-learn/attachments/20160619/606a5be2/attachment.html>