Re: [aerogear-dev] Review process for aerogear PR's

Thanks Sebi. I wasn't aware of this document. It actually matches my suggestion. Recently github added 2 different options for PR's so suggestion here is to also use this options more to automate merges. Git workflow should not be affected. On Tue, Dec 13, 2016 at 5:54 PM, Sebastien Blanc <scm.blanc(a)gmail.com&gt; wrote: > Why don't keep following what is defined here https://aerogear.org/docs > /guides/GitHubWorkflow/ ? > > On Tue, Dec 13, 2016 at 6:44 PM, Wojciech Trocki <wtrocki(a)redhat.com&gt; > wrote: > >> TL;DR - Suggested options: >> >> >> ​EXPLANATION: >> >> Allow squash merging - Default option used for most of the cases >> >> Allow rebase merging - Use when you want to integrate changes with >> multiple commits >> >> >> On Tue, Dec 13, 2016 at 5:19 PM, Wojciech Trocki <wtrocki(a)redhat.com&gt; >> wrote: >> >>> Hi Aerogear Developers :) >>> >>> 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)? >>> >>> 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. >>> >>> 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. >>> >>> Regards >>> >>> -- >>> Wojciech Trocki >>> Software Engineer, Red Hat Mobile >>> >>> >> >> >> -- >> Wojciech Trocki >> Software Engineer, Red Hat Mobile >> >> >> _______________________________________________ >> aerogear-dev mailing list >> aerogear-dev(a)lists.jboss.org >> https://lists.jboss.org/mailman/listinfo/aerogear-dev >> > > > _______________________________________________ > aerogear-dev mailing list > aerogear-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/aerogear-dev > -- Wojciech Trocki Software Engineer, Red Hat Mobile _______________________________________________ aerogear-dev mailing list aerogear-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/aerogear-dev