Thanks Andrea! On Fri, Apr 17, 2020 at 11:36 AM Andrea Cosentino <ancosen1...@yahoo.com.invalid> wrote:
> https://issues.apache.org/jira/browse/INFRA-20137 > > -- > Andrea Cosentino > ---------------------------------- > Apache Camel PMC Chair > Apache Karaf Committer > Apache Servicemix PMC Member > Email: ancosen1...@yahoo.com > Twitter: @oscerd2 > Github: oscerd > > > > > > > On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks < > david.a.jen...@gmail.com> wrote: > > > > > > Thanks! > David Jencks > > > On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <anco...@gmail.com> wrote: > > > > This is something only INFRA could setup. > > > > I think it's not something critical, I'll raise an issue to INFRA anyway. > > > > Il giorno gio 16 apr 2020 alle ore 17:54 David Jencks < > > david.a.jen...@gmail.com> ha scritto: > > > >> Lets not let this drop on the floor and get forgotten… > >> > >> The instructions for enabling and requiring rebase-and-merge for PRs are > >> here: > >> > https://help.github.com/en/github/administering-a-repository/configuring-commit-rebasing-for-pull-requests > >> > >> I don’t appear to have the permissions to set this up…. who does? > >> > >> Does anyone know if there are equivalent options/settings for the apache > >> git repo? > >> > >> Thanks > >> David Jencks > >> > >>> On Apr 15, 2020, at 10:22 PM, David Jencks <david.a.jen...@gmail.com> > >> wrote: > >>> > >>> Hi Claus, > >>> > >>> I think that sometimes more than one commit is appropriate for a PR. > >> For instance some of mine recently have consisted of a few lines change > of > >> generation code and hundreds of files changed as a result. It’s much > >> clearer if those are two separate commits. Also, my impression is that > the > >> project settings have the GitHub button be just “merge” without squash. > >>> > >>> I’ve been waiting for review of my PRs which means it’s extremely > likely > >> that master will have progressed since my push. So I think the project > >> rebase and push setting will be a real help. > >>> > >>> Thanks > >>> David Jencks > >>> > >>>> On Apr 15, 2020, at 10:00 PM, Claus Ibsen <claus.ib...@gmail.com> > >> wrote: > >>>> > >>>> Hi > >>>> > >>>> Yes we should do rebase and merge, or squash and merge style, so its > >> linear. > >>>> On github the green button is default for "squash and merge". > >>>> > >>>> I always do git pull --rebase from CLI before pushing, so my commits > >>>> are added on top of the branch. > >>>> > >>>> > >>>> > >>>> On Wed, Apr 15, 2020 at 10:09 PM Pascal Schumacher > >>>> <pascalschumac...@gmx.net> wrote: > >>>>> > >>>>> Hi, > >>>>> > >>>>> recently there were several merge commits (especially for merged pull > >>>>> request). > >>>>> > >>>>> I thought the consensus was to avoid merge commits to keep the git > >>>>> history as clean as possible. > >>>>> > >>>>> Should we keep this policy? > >>>>> > >>>>> What do you think? > >>>>> > >>>>> Cheers, > >>>>> > >>>>> Pascal > >>>>> > >>>>> > >>>> > >>>> > >>>> -- > >>>> Claus Ibsen > >>>> ----------------- > >>>> http://davsclaus.com @davsclaus > >>>> Camel in Action 2: https://www.manning.com/ibsen2 > >>> > >> > >> >
