On Thu, 14 Apr 2016 09:39:55 -0500 Ryan Gonzalez <rym...@gmail.com> 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 unless you know nobody else based their work on it. That matches my experience :-) 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
