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

[Ryan Gonzalez]

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