[aerogear-dev] Git Merge Policy Review

[Douglas Campos]

On Mon, Jul 22, 2013 at 01:56:31PM +0200, Karel Piwko wrote:
> On Mon, 22 Jul 2013 06:40:18 -0500
> Kris Borchers <kris at redhat.com> wrote:
> 
> > I'll just take this as an opportunity to once again say I hate merge commits
> > and thus, I hate --no-ff in all cases.
> > 
> > </rant>
> 
> Same here.
> 
> That said, ff merge for single commits and for PRs to feature
> branches policy could cover all PRs if squashed first ;-)
Then you lose history + end up with gigantic commits with unrelated
changes - been there unfortunately.

-- 
qmx