On Wed, Dec 19, 2018 at 7:47 AM Antoine Pitrou 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 Wed, Dec 19, 2018 at 7:47 AM Francois Saint-Jacques
wrote:
>
> No issue with this.
>
> When the final squash is done, which title/body is preserved?
The PR title (in GitHub) and the PR description are what matter. The
commit messages don't really matter
>
> On Wed, Dec 19, 2018 at 8:43 AM Wes
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.
Regards
Antoine.
No issue with this.
When the final squash is done, which title/body is preserved?
On Wed, Dec 19, 2018 at 8:43 AM Wes McKinney wrote:
> hi folks,
>
> As the contributor base has grown, our development styles have grown
> increasingly diverse.
>
> Sometimes contributors are used to working in a
