[core-workflow] New Github Features
Antoine Pitrou
solipsis at pitrou.net
Thu Apr 14 10:47:32 EDT 2016
On Thu, 14 Apr 2016 09:39:55 -0500
Ryan Gonzalez <rymg19 at 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.
More information about the core-workflow
mailing list