On Thu, 14 Apr 2016 09:39:55 -0500
Ryan Gonzalez wrote:
> Generally, if you also squash the second PR, it won't be hard to merge it,
> since you're resolving a small set of conflicts. If the second one consists
> of 10 commits, then the world will likely explode.
So, basically, don't squash a PR
Generally, if you also squash the second PR, it won't be hard to merge it,
since you're resolving a small set of conflicts. If the second one consists
of 10 commits, then the world will likely explode.
--
Ryan
[ERROR]: Your autotools build scripts are 200 lines longer than your
program. Something’
On Sat, 2 Apr 2016 15:07:21 +1000
Nick Coghlan wrote:
> On 2 April 2016 at 06:59, Brett Cannon wrote:
> > So this support of squash merging may be useful. It really depends on how we
> > try and support porting changes between versions and Misc/NEWS.
>
> Having the bot handle squashing is likely
> On Apr 1, 2016, at 22:07, Nick Coghlan wrote:
>
> On 2 April 2016 at 06:59, Brett Cannon wrote:
>> So this support of squash merging may be useful. It really depends on how we
>> try and support porting changes between versions and Misc/NEWS.
>
> Having the bot handle squashing is likely sti
> On Apr 1, 2016, at 22:07, Nick Coghlan wrote:
>
> On 2 April 2016 at 06:59, Brett Cannon wrote:
>> So this support of squash merging may be useful. It really depends on how we
>> try and support porting changes between versions and Misc/NEWS.
>
> Having the bot handle squashing is likely sti
On 2 April 2016 at 06:59, Brett Cannon wrote:
> So this support of squash merging may be useful. It really depends on how we
> try and support porting changes between versions and Misc/NEWS.
Having the bot handle squashing is likely still desirable, since the
flow you really want is:
- squash &
On Fri, 1 Apr 2016 at 14:03 Donald Stufft wrote:
>
> On Apr 1, 2016, at 4:59 PM, Brett Cannon wrote:
>
> As for Misc/NEWS, we could stick with the plan of moving to a file-based
> solution but have external contributors actually write the NEWS entry. Core
> devs could then request any rewrite th
> On Apr 1, 2016, at 4:59 PM, Brett Cannon wrote:
>
> As for Misc/NEWS, we could stick with the plan of moving to a file-based
> solution but have external contributors actually write the NEWS entry. Core
> devs could then request any rewrite they have for the entry which wouldn't be
> a huge
On Fri, 1 Apr 2016 at 12:34 Donald Stufft wrote:
> Just wanted to point out a few new features from GitHub that may (or may
> not!)
> be useful for Python’s use of Github:
>
> * Required status checks no longer requiring a branch to be up to date.
>
> Previously turning on required status check
