[scikit-learn] always Squash and Merge?

[Nelle Varoquaux]

On 28 September 2016 at 08:18, Andreas Mueller <t3kcit at gmail.com> wrote:
>
>
> On 09/28/2016 10:05 AM, Gael Varoquaux wrote:
>>
>> I am not against it. When I think about why I didn't use it, it was a
>> combination of laziness and lack of trust in git (ie I was worried of
>> hard-to-resolve conflicts).
>
> Cool.
> I think we didn't run into any problems with it so far, and we have used
> it relatively extensively.
> I think it's a good default until we run into trouble.
> And once you use it, I think it becomes your default on github.

With squash and merge, there shouldn't be any problems ever. Rebasing
onto mastre would be the tricky part.

The only disadvantage is that you loose a lot of history on large PRs.

>
> _______________________________________________
> scikit-learn mailing list
> scikit-learn at python.org
> https://mail.python.org/mailman/listinfo/scikit-learn