[Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Nathaniel Smith]

Isn't that what happens if someone enables the check box at Repository
Settings -> Branches -> Branch protection rules -> [pick a branch] ->
Require branches to be up to date before merging ?

On Mon, May 28, 2018, 09:11 Brett Cannon <brett at python.org> wrote:

> Ryan is right that there's no special setting in GitHub at least which
> would make merging more strict for certain branches as you're describing.
>
> On Mon, 28 May 2018 at 07:06 Ryan Gonzalez <rymg19 at gmail.com> wrote:
>
>> AFAIK there's no setting like this available, and I've done this many
>> times
>> on other repos with no trouble. Maybe it could be a GitHub bug?
>>
>>
>> On May 28, 2018 4:59:03 AM Victor Stinner <vstinner at redhat.com> wrote:
>>
>> > Hi,
>> >
>> > Since one or two weeks, I noticed that it's difficult to merge pull
>> > requests into the 2.7 branch. If a different commit is pushed in the
>> > meanwhile (if a different PR has been merged), the 2.7 branch diverges
>> > and the PR is immediately marked as "This branch is out-of-date with
>> > the base branch" and the "Squash and Merge" button is disabled (grey).
>> >
>> > For example my PR https://github.com/python/cpython/pull/7120 which
>> > changes Lib/test/regrtest.py cannot be merged because a commit
>> > touching the documentation (Doc/ directory) has been merged after I
>> > posted my PR and before the CI completed.
>> >
>> > I don't see the same behavior on the master branch. Is the 2.7 branch
>> > configured as more strict?
>> >
>> > Victor
>> > _______________________________________________
>> > Python-Dev mailing list
>> > Python-Dev at python.org
>> > https://mail.python.org/mailman/listinfo/python-dev
>> > Unsubscribe:
>> > https://mail.python.org/mailman/options/python-dev/rymg19%40gmail.com
>>
>>
>> _______________________________________________
>> Python-Dev mailing list
>> Python-Dev at python.org
>> https://mail.python.org/mailman/listinfo/python-dev
>> Unsubscribe:
>> https://mail.python.org/mailman/options/python-dev/brett%40python.org
>>
> _______________________________________________
> Python-Dev mailing list
> Python-Dev at python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/njs%40pobox.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-dev/attachments/20180528/67e18378/attachment.html>