<div dir="ltr">><span style="font-family:arial,sans-serif;font-size:13px">we should stick to fast-forward merges:</span><span style="font-family:arial,sans-serif;font-size:13px">single-commit PRs and PRs to feature branches.</span><div>
<span style="font-family:arial,sans-serif;font-size:13px">+1 Sounds good to me.</span></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On 22 July 2013 07:31, Douglas Campos <span dir="ltr"><<a href="mailto:qmx@qmx.me" target="_blank">qmx@qmx.me</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Since this is the second time I'm facing the same dillema, I think it's<br>
worthwhile to discuss this here.<br>
<br>
We have been doing the --no-ff merges for everything, but I just found<br>
two cases where I really think we should stick to fast-forward merges:<br>
single-commit PRs and PRs to feature branches.<br>
<br>
Thoughts on this? Any other comments/suggestions wrt git workflows we<br>
use?<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
qmx<br>
_______________________________________________<br>
aerogear-dev mailing list<br>
<a href="mailto:aerogear-dev@lists.jboss.org">aerogear-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/aerogear-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/aerogear-dev</a><br>
</font></span></blockquote></div><br></div>