<div dir="ltr">Why don't keep following what is defined here <a href="https://aerogear.org/docs/guides/GitHubWorkflow/">https://aerogear.org/docs/guides/GitHubWorkflow/</a> ? </div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Dec 13, 2016 at 6:44 PM, Wojciech Trocki <span dir="ltr"><<a href="mailto:wtrocki@redhat.com" target="_blank">wtrocki@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">TL;DR - Suggested options:<div><br></div><div><img src="cid:ii_iwnsq1dd0_158f94762eaded77" width="536" height="304"><br><font size="4">EXPLANATION:</font></div><div><label for="m_-9163871500541693294merge_types_squash" style="color:rgb(102,102,102);font-family:-apple-system,blinkmacsystemfont,"segoe ui",helvetica,arial,sans-serif,"apple color emoji","segoe ui emoji","segoe ui symbol";font-size:14px;box-sizing:border-box;font-weight:600"><br></label></div><div><label for="m_-9163871500541693294merge_types_squash" style="color:rgb(102,102,102);font-family:-apple-system,blinkmacsystemfont,"segoe ui",helvetica,arial,sans-serif,"apple color emoji","segoe ui emoji","segoe ui symbol";font-size:14px;box-sizing:border-box;font-weight:600">Allow squash merging</label><span style="color:rgb(102,102,102);font-family:-apple-system,blinkmacsystemfont,"segoe ui",helvetica,arial,sans-serif,"apple color emoji","segoe ui emoji","segoe ui symbol";font-size:14px"> - Default option used for most of the cases</span></div><div><label for="m_-9163871500541693294merge_types_rebase" style="color:rgb(102,102,102);font-family:-apple-system,blinkmacsystemfont,"segoe ui",helvetica,arial,sans-serif,"apple color emoji","segoe ui emoji","segoe ui symbol";font-size:14px;box-sizing:border-box;font-weight:600"><br></label></div><div><label for="m_-9163871500541693294merge_types_rebase" style="color:rgb(102,102,102);font-family:-apple-system,blinkmacsystemfont,"segoe ui",helvetica,arial,sans-serif,"apple color emoji","segoe ui emoji","segoe ui symbol";font-size:14px;box-sizing:border-box;font-weight:600">Allow rebase merging</label><span style="color:rgb(102,102,102);font-family:-apple-system,blinkmacsystemfont,"segoe ui",helvetica,arial,sans-serif,"apple color emoji","segoe ui emoji","segoe ui symbol";font-size:14px"> - Use when you want to integrate changes with multiple commits </span></div><div><br></div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Dec 13, 2016 at 5:19 PM, Wojciech Trocki <span dir="ltr"><<a href="mailto:wtrocki@redhat.com" target="_blank">wtrocki@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span style="font-size:12.8px">Hi Aerogear Developers :)</span><div><br></div><div><div style="font-size:12.8px">Do you guys think that we can use github squash or merge option as default action for aerogear digger repos (or even every aerogear repository)? </div><div style="font-size:12.8px"><br></div><div style="font-size:12.8px"> Aerogear contribution guide doesn't state how tickets are reviewed etc. but I see that most of the opensource projects use squashing option after merging to master - this would still allow us to push as many commits as we want. Squashing would be performed before merge to master on github. This would make our git logs clean and would simplify releases etc.</div><div style="font-size:12.8px"><br></div><div style="font-size:12.8px">I do not want to start some holly war here, but I would just like to keep things clean and avoid some commits to repo without actual meaning or simply incomplete. When checking changes on the master multiple commits can make things difficult. It would be hard to provide some release notes basing on that etc. <br><br>Regards</div><span class="m_-9163871500541693294HOEnZb"><font color="#888888"><div><br></div>-- <br><div class="m_-9163871500541693294m_-5572799657385675944gmail-m_6147916956460765850gmail_signature"><div dir="ltr"><div><div dir="ltr"><div style="font-size:12.8px"><span style="color:rgb(153,153,153);font-size:small">Wojciech Trocki</span></div><div><div><font color="#999999" size="2">Software Engineer</font><font color="#999999" style="font-size:small">, Red Hat Mobile</font></div><div><div style="font-size:small"><br></div><div style="font-size:small"><img src="cid:1deff70600823b9ebf187fa9e94df6ff10966d4e@zimbra"></div></div></div></div></div></div></div>
</font></span></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="m_-9163871500541693294gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div style="font-size:12.8px"><span style="color:rgb(153,153,153);font-size:small">Wojciech Trocki</span></div><div><div><font color="#999999" size="2">Software Engineer</font><font color="#999999" style="font-size:small">, Red Hat Mobile</font></div><div><div style="font-size:small"><br></div><div style="font-size:small"><img src="cid:1deff70600823b9ebf187fa9e94df6ff10966d4e@zimbra"></div></div></div></div></div></div></div>
</div>
</div></div><br>______________________________<wbr>_________________<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" rel="noreferrer" target="_blank">https://lists.jboss.org/<wbr>mailman/listinfo/aerogear-dev</a><br></blockquote></div><br></div>