On Wed, Dec 19, 2018 at 7:47 AM Antoine Pitrou <anto...@python.org> wrote: > > > Le 19/12/2018 à 14:42, Wes McKinney a écrit : > > > > * Our PR merge tool (dev/merge_arrow_py.py) squashes all the commits > > anyway, so squashing twice is redundant > > The problem is you can then get spurious conflicts if you base a PR on > another. Happened to me several times.
Agreed -- I didn't say "never squash" but to "avoid" or "limit" it. The stacked PR use case is a good example where things can be painful if all your commits are not atomic. This does not describe the average pull request, though > > Regards > > Antoine.
