Re: [aerogear-dev] Git Merge Policy Review
On 07/22/2013 01:31 AM, Douglas Campos 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?
If it is a single commit PR to master I kinda like have a single word
description from the branch name if it is anything more than an
extremely minor change.
So +.9 to single commit no ff and +1 to prs to feature branches.