You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Pascal Schumacher <pa...@gmx.net> on 2020/04/15 20:09:02 UTC
Merge Commits?
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
Re: Merge Commits?
Posted by Tadayoshi Sato <sa...@gmail.com>.
+1 for avoiding merge commits in favour of linear history. While
undocumented, I learned it on the job by reading the commit history which
is mostly linear except developing big feature branches like the major
upgrade. Of course, it would be better if the policy is documented clearly
somewhere.
A couple points that support linear commit history:
* Camel accepts many community contributions via GitHub pull reqs. Not
rebasing them would add non-necessary merge-point commits in the history
and make it lengthier.
* We have many regular committers who work in parallel. Allowing merges
would make the history messy and hard to trace changes for troubleshooting
and learning from history.
On Thu, Apr 16, 2020 at 7:19 AM David Jencks <da...@gmail.com>
wrote:
> I’m in favor of changing the GitHub camel repositories to enforce
> rebase-and-merge: Rebasing and merging your commits <
> https://help.github.com/en/github/administering-a-repository/about-merge-methods-on-github#rebasing-and-merging-your-commits>.
> This will produce linear history. IIUC, the committer on each commit will
> change to the person doing the rebase-and-merge, and the author will remain
> unchanged.
>
> Is it possible to do something equivalent on the Apache git repo?
>
> AFAICT without this, GitHub merges will definitely have a merge commit and
> may have non-linear history.
>
> Thanks
> David Jencks
>
> > On Apr 15, 2020, at 2:08 PM, Andrea Cosentino <an...@gmail.com> wrote:
> >
> > I don't think there is a consensus around this.. we can collect here the
> > different views. Personally I don't think merge commits are evil, but if
> a
> > clean history is desired it's fine for me
> >
> >
> > Il mer 15 apr 2020, 22:09 Pascal Schumacher <pa...@gmx.net>
> ha
> > scritto:
> >
> >> 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
> >>
> >>
> >>
>
>
--
Tadayoshi Sato
Re: Merge Commits?
Posted by David Jencks <da...@gmail.com>.
I’m in favor of changing the GitHub camel repositories to enforce rebase-and-merge: Rebasing and merging your commits <https://help.github.com/en/github/administering-a-repository/about-merge-methods-on-github#rebasing-and-merging-your-commits>. This will produce linear history. IIUC, the committer on each commit will change to the person doing the rebase-and-merge, and the author will remain unchanged.
Is it possible to do something equivalent on the Apache git repo?
AFAICT without this, GitHub merges will definitely have a merge commit and may have non-linear history.
Thanks
David Jencks
> On Apr 15, 2020, at 2:08 PM, Andrea Cosentino <an...@gmail.com> wrote:
>
> I don't think there is a consensus around this.. we can collect here the
> different views. Personally I don't think merge commits are evil, but if a
> clean history is desired it's fine for me
>
>
> Il mer 15 apr 2020, 22:09 Pascal Schumacher <pa...@gmx.net> ha
> scritto:
>
>> 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
>>
>>
>>
Re: Merge Commits?
Posted by Andrea Cosentino <an...@gmail.com>.
I don't think there is a consensus around this.. we can collect here the
different views. Personally I don't think merge commits are evil, but if a
clean history is desired it's fine for me
Il mer 15 apr 2020, 22:09 Pascal Schumacher <pa...@gmx.net> ha
scritto:
> 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
>
>
>
Re: Merge Commits?
Posted by Omar Al-Safi <om...@oalsafi.com>.
Sorry I wasn't aware of such thing, do we have some guidelines regarding
this? I don't recall I came through this. Perhaps, we can add a page of
guidelines and tips for committers to follow? I think Camel has grown and
with it the amount of committers have grown which is a good thing of course.
Regards,
Omar
On Wed, Apr 15, 2020, 22:29 David Jencks <da...@gmail.com> wrote:
> I’m a bit unclear on terms and actions.
>
> If you have a PR on GitHub that is up to date with master and you press
> the “merge” button do you get a merge commit?
>
> I’m definitely against anything that results in non-linear history on a
> branch, and would support anything that enforces this.
>
> I’ve looked for a description of of the camel git workflow and haven’t
> been able to find any documentation.
>
> David Jencks
>
> > On Apr 15, 2020, at 1:09 PM, Pascal Schumacher <pa...@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
> >
> >
>
>
Re: Merge Commits?
Posted by David Jencks <da...@gmail.com>.
I’m a bit unclear on terms and actions.
If you have a PR on GitHub that is up to date with master and you press the “merge” button do you get a merge commit?
I’m definitely against anything that results in non-linear history on a branch, and would support anything that enforces this.
I’ve looked for a description of of the camel git workflow and haven’t been able to find any documentation.
David Jencks
> On Apr 15, 2020, at 1:09 PM, Pascal Schumacher <pa...@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
>
>
Re: Merge Commits?
Posted by Alex Dettinger <al...@gmail.com>.
+1 :)
On Fri, Apr 17, 2020 at 4:48 PM Pascal Schumacher <pa...@gmx.net>
wrote:
> Thank you very much!
>
> Am 17.04.2020 um 15:56 schrieb Andrea Cosentino:
> > We have now only squash and merge and rebase and merge enabled on
> >
> > camel
> > camel-karaf
> > camel-spring-boot
> >
> > --
> > Andrea Cosentino
> > ----------------------------------
> > Apache Camel PMC Chair
> > Apache Karaf Committer
> > Apache Servicemix PMC Member
> > Email: ancosen1985@yahoo.com
> > Twitter: @oscerd2
> > Github: oscerd
> >
> >
> >
> >
> >
> >
> > On Friday, April 17, 2020, 11:40:19 AM GMT+2, Omar Al-Safi <
> omar@oalsafi.com> wrote:
> >
> >
> >
> >
> >
> > Thanks Andrea!
> >
> > On Fri, Apr 17, 2020 at 11:36 AM Andrea Cosentino
> <an...@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: ancosen1985@yahoo.com
> >> Twitter: @oscerd2
> >> Github: oscerd
> >>
> >>
> >>
> >>
> >>
> >>
> >> On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks <
> david.a.jencks@gmail.com> wrote:
> >>
> >>
> >>
> >>
> >>
> >> Thanks!
> >> David Jencks
> >>
> >>> On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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.jencks@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 <cl...@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
> >>>>>> <pa...@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
> >>>>
>
>
Re: Merge Commits?
Posted by Pascal Schumacher <pa...@gmx.net>.
Thank you very much!
Am 17.04.2020 um 15:56 schrieb Andrea Cosentino:
> We have now only squash and merge and rebase and merge enabled on
>
> camel
> camel-karaf
> camel-spring-boot
>
> --
> Andrea Cosentino
> ----------------------------------
> Apache Camel PMC Chair
> Apache Karaf Committer
> Apache Servicemix PMC Member
> Email: ancosen1985@yahoo.com
> Twitter: @oscerd2
> Github: oscerd
>
>
>
>
>
>
> On Friday, April 17, 2020, 11:40:19 AM GMT+2, Omar Al-Safi <om...@oalsafi.com> wrote:
>
>
>
>
>
> Thanks Andrea!
>
> On Fri, Apr 17, 2020 at 11:36 AM Andrea Cosentino <an...@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: ancosen1985@yahoo.com
>> Twitter: @oscerd2
>> Github: oscerd
>>
>>
>>
>>
>>
>>
>> On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks <da...@gmail.com> wrote:
>>
>>
>>
>>
>>
>> Thanks!
>> David Jencks
>>
>>> On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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 <da...@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 <cl...@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
>>>>>> <pa...@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
>>>>
Re: Merge Commits?
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
We have now only squash and merge and rebase and merge enabled on
camel
camel-karaf
camel-spring-boot
--
Andrea Cosentino
----------------------------------
Apache Camel PMC Chair
Apache Karaf Committer
Apache Servicemix PMC Member
Email: ancosen1985@yahoo.com
Twitter: @oscerd2
Github: oscerd
On Friday, April 17, 2020, 11:40:19 AM GMT+2, Omar Al-Safi <om...@oalsafi.com> wrote:
Thanks Andrea!
On Fri, Apr 17, 2020 at 11:36 AM Andrea Cosentino <an...@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: ancosen1985@yahoo.com
> Twitter: @oscerd2
> Github: oscerd
>
>
>
>
>
>
> On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks <da...@gmail.com> wrote:
>
>
>
>
>
> Thanks!
> David Jencks
>
>> On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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 <da...@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 <cl...@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
>>>>> <pa...@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
>>>>
>>>
>>>
>
Re: Merge Commits?
Posted by Omar Al-Safi <om...@oalsafi.com>.
Thanks Andrea!
On Fri, Apr 17, 2020 at 11:36 AM Andrea Cosentino
<an...@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: ancosen1985@yahoo.com
> Twitter: @oscerd2
> Github: oscerd
>
>
>
>
>
>
> On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks <
> david.a.jencks@gmail.com> wrote:
>
>
>
>
>
> Thanks!
> David Jencks
>
> > On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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 <da...@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 <cl...@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
> >>>> <pa...@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
> >>>
> >>
> >>
>
Re: Merge Commits?
Posted by Zoran Regvart <zo...@regvart.com>.
Hi Cameleers,
I recently became aware of the `.asf.yaml` file that we can use to
tweak these settings, so in case someone else also missed it here is
the documentation:
https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
zoran
On Fri, Apr 17, 2020 at 11:36 AM Andrea Cosentino
<an...@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: ancosen1985@yahoo.com
> Twitter: @oscerd2
> Github: oscerd
>
>
>
>
>
>
> On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks <da...@gmail.com> wrote:
>
>
>
>
>
> Thanks!
> David Jencks
>
> > On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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 <da...@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 <cl...@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
> >>>> <pa...@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
> >>>
> >>
> >>
--
Zoran Regvart
Re: Merge Commits?
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
https://issues.apache.org/jira/browse/INFRA-20137
--
Andrea Cosentino
----------------------------------
Apache Camel PMC Chair
Apache Karaf Committer
Apache Servicemix PMC Member
Email: ancosen1985@yahoo.com
Twitter: @oscerd2
Github: oscerd
On Thursday, April 16, 2020, 06:07:18 PM GMT+2, David Jencks <da...@gmail.com> wrote:
Thanks!
David Jencks
> On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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 <da...@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 <cl...@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
>>>> <pa...@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
>>>
>>
>>
Re: Merge Commits?
Posted by David Jencks <da...@gmail.com>.
Thanks!
David Jencks
> On Apr 16, 2020, at 8:56 AM, Andrea Cosentino <an...@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.jencks@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 <da...@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 <cl...@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
>>>> <pa...@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
>>>
>>
>>
Re: Merge Commits?
Posted by Andrea Cosentino <an...@gmail.com>.
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.jencks@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 <da...@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 <cl...@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
> >> <pa...@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
> >
>
>
Re: Merge Commits?
Posted by David Jencks <da...@gmail.com>.
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 <da...@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 <cl...@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
>> <pa...@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
>
Re: Merge Commits?
Posted by David Jencks <da...@gmail.com>.
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 <cl...@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
> <pa...@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
Re: Merge Commits?
Posted by Claus Ibsen <cl...@gmail.com>.
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
<pa...@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