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’s wrong. http://kirbyfan64.github.io/ On Apr 14, 2016 4:15 AM, "Antoine Pitrou" <solip...@pitrou.net> wrote: > On Sat, 2 Apr 2016 15:07:21 +1000 > Nick Coghlan <ncogh...@gmail.com> wrote: > > On 2 April 2016 at 06:59, Brett Cannon <br...@python.org> 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 & rebase the PR > > - run the test suite/build the docs (depending on modified files) > > - commit if successful > > What happens if there's a PR based on another PR? When the latter is > squash-merged, the former will likely end up with many conflicts since > git won't be able to reconcile the histories anymore. > > Regards > > Antoine. > > > _______________________________________________ > core-workflow mailing list > core-workflow@python.org > https://mail.python.org/mailman/listinfo/core-workflow > This list is governed by the PSF Code of Conduct: > https://www.python.org/psf/codeofconduct >
_______________________________________________ core-workflow mailing list core-workflow@python.org https://mail.python.org/mailman/listinfo/core-workflow This list is governed by the PSF Code of Conduct: https://www.python.org/psf/codeofconduct
