[aerogear-dev] Git Merge Policy Review

[Kris Borchers]

TBH, I always make sure the PR is rebased then merge and there is no merge commit and no lost history. Sure, sometimes conflicts have to be resolved but that has to be done one way or another.

On Jul 22, 2013, at 8:28 AM, "Heiko W.Rupp" <hrupp at redhat.com> wrote:

> 
> Am 22.07.2013 um 15:15 schrieb Douglas Campos:
>> squashing has them too (gigantic commits)
> 
> Much better than a huge merge / rebase with hundreds of individual
> commits, perhaps even changing the same line of code a dozen
> times.
> 
> _______________________________________________
> aerogear-dev mailing list
> aerogear-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/aerogear-dev