[aerogear-dev] Git Merge Policy Review

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