[aerogear-dev] Git Merge Policy Review
Karel Piwko
kpiwko at redhat.com
Mon Jul 22 07:56:31 EDT 2013
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 ;-)
>
> On Jul 22, 2013, at 12:31 AM, Douglas Campos <qmx at qmx.me> wrote:
>
> > Since this is the second time I'm facing the same dillema, I think it's
> > worthwhile to discuss this here.
> >
> > We have been doing the --no-ff merges for everything, but I just found
> > two cases where I really think we should stick to fast-forward merges:
> > single-commit PRs and PRs to feature branches.
> >
> > Thoughts on this? Any other comments/suggestions wrt git workflows we
> > use?
> >
> > --
> > qmx
> > _______________________________________________
> > aerogear-dev mailing list
> > aerogear-dev at lists.jboss.org
> > https://lists.jboss.org/mailman/listinfo/aerogear-dev
>
>
> _______________________________________________
> aerogear-dev mailing list
> aerogear-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/aerogear-dev
More information about the aerogear-dev
mailing list