I've been doing --no-ff to merge PRs, even if they have a single commit
or they are feature branches. Do we have a policy for it?
Once we have a very well defined policy (e-mail, piece of papers or
whatever), I have no problems on change it.
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?
--
abstractj