[Biopython-dev] GitHub squash commits?

[Peter Cock]

The setting is there under "Settings" on the "Options" tab,
although having switched it over, it doesn't seem to have had any
immediate effect... maybe it only happens on new pull requests?

Peter

On Fri, Apr 1, 2016 at 10:32 PM, João Rodrigues
<j.p.g.l.m.rodrigues at gmail.com> wrote:
> Hi Peter,
>
> Sure hope it's not an April 1st joke :) I'd be in favor, since it keeps the
> story cleaner. I for one dislike the additional merge commit, it's just
> polluting the timeline..
>
> Cheers,
>
> João
>
> 2016-04-01 14:23 GMT-07:00 Peter Cock <p.j.a.cock at googlemail.com>:
>>
>> Re: https://github.com/blog/2141-squash-your-commits
>>
>> My personal preference thus far has been to avoid the "big green merge"
>> button on GitHub pull requests, which until now did "git merge --no-ff
>> ..." internally in favour of a fast-forward merge where possible, which
>> gives a simple linear history.
>>
>> I tend also to cherry-pick commits, rebase branches and at times do
>> squash commits when merging - again in favour of a simple linear history.
>>
>> I always felt this was closest to Biopython's pre-git model of working
>> from a stable branch in CVS.
>>
>> GitHub's interface now allows this via the web interface with the
>> "squash commit".
>>
>> How do people feel about making the squash commit the default
>> via the web interface? This would still leave full flexibility at the
>> command line, but for when merging simple requested in the
>> website we'd get a nice linear history :)
>>
>> Regards,
>>
>> Peter
>> _______________________________________________
>> Biopython-dev mailing list
>> Biopython-dev at mailman.open-bio.org
>> http://mailman.open-bio.org/mailman/listinfo/biopython-dev
>
>