Re: [Freemint-discuss] Bintray integration / git force-push needed

[Vincent R. <vin...@fr...>]

On 20/03/2018 at 21:22, Miro Kropáček wrote:
>     The solution is simple: use *rebase* to integrate pull requests,
>     instead of *merge*.
>
> However this doesn't solve the problem of useless/reworked commits, does
> it? You just get them in a linear fashion.

The contributor can be asked to rework its contribution (by adding new 
commits to his local branch) until the squashed commit is acceptable.
Finally, there will be a single clean commit for the contribution in 
official sources.

Of course, this applies only to relatively small changes.
In case of big feature branches (which are not so common), of course a 
classic merge is preferable.

-- 
Vincent Rivière