[Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
Paul G
paul at ganssle.io
Tue May 29 11:36:47 EDT 2018
More information about the Python-Dev mailing list
Tue May 29 11:36:47 EDT 2018
- Previous message (by thread): [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
- Next message (by thread): [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
This doesn't seem like the best idea, since it would kick off dozens or hundreds of builds for every commit to the master branch. On 05/29/2018 11:25 AM, Matthias Bussonnier wrote: >> As I wrote, it became very difficult to merge any PR on 2.7 because of >> that. We all run a race to be the first one to merge a change into >> 2.7. The next one will get a "conflict" even if the merged commit is >> unrelated (as I described: two different unrelated directories). > > Couldn't miss-islington be configured to automatically rebase those (when > there is no actual conflict). The "Allow edit from maintainer" would most > likely permit to push on the PRs branch. > > > > _______________________________________________ > 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/paul%40ganssle.io > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: OpenPGP digital signature URL: <http://mail.python.org/pipermail/python-dev/attachments/20180529/01999959/attachment-0001.sig>
- Previous message (by thread): [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
- Next message (by thread): [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Python-Dev mailing list