[aerogear-dev] Git Merge Policy Review

[Daniel Bevenius]

>we should stick to fast-forward merges:single-commit PRs and PRs to
feature branches.
+1 Sounds good to me.


On 22 July 2013 07:31, 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/aerogear-dev/attachments/20130722/20cfad84/attachment.html