You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tubemq.apache.org by tison <wa...@gmail.com> on 2020/01/09 02:39:02 UTC
[DISCUSS] Prefer rebase and merge for patch/pr
Hi developers,
Recently I notice that the commit history contains a number of merge
commits. Per the discussion
of commit title commit IMO we prefer rebase (possibly squash) and merge
instead of merging with
a merge commit.
If there is no objection I'm going to document the standard on our wiki
page as
HowToDevelop/Merging Pull Requests
.
Open to thoughts.
Best,
tison.
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by kaynewu <ka...@apache.org>.
+1
tison <wa...@gmail.com> 于2020年1月9日周四 上午10:39写道：
> Hi developers,
>
> Recently I notice that the commit history contains a number of merge
> commits. Per the discussion
> of commit title commit IMO we prefer rebase (possibly squash) and merge
> instead of merging with
> a merge commit.
>
> If there is no objection I'm going to document the standard on our wiki
> page as
>
> HowToDevelop/Merging Pull Requests
>
> .
>
> Open to thoughts.
>
> Best,
> tison.
>
答复: [DISCUSS] Prefer rebase and merge for patch/pr(Internet mail)
Posted by "osgooli (李致波)" <os...@tencent.com>.
+1
-----邮件原件-----
发件人: lamber liu <la...@gmail.com>
发送时间: 2020年1月9日 10:57
收件人: dev@tubemq.apache.org
主题: Re: [DISCUSS] Prefer rebase and merge for patch/pr(Internet mail)
+1
On Thu, Jan 9, 2020 at 10:39 AM tison <wa...@gmail.com> wrote:
> Hi developers,
>
> Recently I notice that the commit history contains a number of merge
> commits. Per the discussion of commit title commit IMO we prefer
> rebase (possibly squash) and merge instead of merging with a merge
> commit.
>
> If there is no objection I'm going to document the standard on our
> wiki page as
>
> HowToDevelop/Merging Pull Requests
>
> .
>
> Open to thoughts.
>
> Best,
> tison.
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by lamber liu <la...@gmail.com>.
+1
On Thu, Jan 9, 2020 at 10:39 AM tison <wa...@gmail.com> wrote:
> Hi developers,
>
> Recently I notice that the commit history contains a number of merge
> commits. Per the discussion
> of commit title commit IMO we prefer rebase (possibly squash) and merge
> instead of merging with
> a merge commit.
>
> If there is no objection I'm going to document the standard on our wiki
> page as
>
> HowToDevelop/Merging Pull Requests
>
> .
>
> Open to thoughts.
>
> Best,
> tison.
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by tison <wa...@gmail.com>.
Thanks for your update!
Best,
tison.
Guangxu Cheng <gx...@apache.org> 于2020年1月10日周五 下午1:11写道：
> Hi all,
>
> The button "create a merge commit" has been disabled.
>
> By the way, please ensure that the title is formatted when merging the
> PR.
>
> Thanks
> --
> Best Regards
> Guangxu
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by Guangxu Cheng <gx...@apache.org>.
Hi all,
The button "create a merge commit" has been disabled.
By the way, please ensure that the title is formatted when merging the
PR.
Thanks
--
Best Regards
Guangxu
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by tison <wa...@gmail.com>.
Hi all,
The page has been created[1].
Please comments on the mailing list or the page with your thoughts.
Best,
tison.
[1] https://cwiki.apache.org/confluence/display/TUBEMQ/Merging+Pull+Requests
tison <wa...@gmail.com> 于2020年1月9日周四 下午1:36写道：
> Thanks!
>
> Best,
> tison.
>
>
> Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 下午1:25写道：
>
>> Hi tison,
>>
>> I have created an infra JIRA, see:
>>
>> https://issues.apache.org/jira/browse/INFRA-19688
>>
>> tison <wa...@gmail.com> 于2020年1月9日周四 下午12:52写道：
>>
>> > @Guangxu,
>> >
>> > Sounds good. I think setting the configuration should be done by infra.
>> > Will create an infra JIRA for it.
>> >
>> > Best,
>> > tison.
>> >
>> >
>> > Goson zhang <go...@gmail.com> 于2020年1月9日周四 上午11:13写道：
>> >
>> > > +1
>> > >
>> > > Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 上午11:12写道：
>> > >
>> > > > Hi tison,
>> > > >
>> > > > Nice discussion, these merge commits is noisy.
>> > > >
>> > > > IIRC GitHub supports disabling this button ("Create a merge
>> commit"),
>> > > So
>> > > > it's a better choice to disable the button directly.
>> > > >
>> > > > WDYT?
>> > > >
>> > > > --
>> > > > Best Regards
>> > > > Guangxu
>> > > >
>> > >
>> >
>>
>>
>> --
>> Best Regards
>> Guangxu
>>
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by tison <wa...@gmail.com>.
Thanks!
Best,
tison.
Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 下午1:25写道：
> Hi tison,
>
> I have created an infra JIRA, see:
>
> https://issues.apache.org/jira/browse/INFRA-19688
>
> tison <wa...@gmail.com> 于2020年1月9日周四 下午12:52写道：
>
> > @Guangxu,
> >
> > Sounds good. I think setting the configuration should be done by infra.
> > Will create an infra JIRA for it.
> >
> > Best,
> > tison.
> >
> >
> > Goson zhang <go...@gmail.com> 于2020年1月9日周四 上午11:13写道：
> >
> > > +1
> > >
> > > Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 上午11:12写道：
> > >
> > > > Hi tison,
> > > >
> > > > Nice discussion, these merge commits is noisy.
> > > >
> > > > IIRC GitHub supports disabling this button ("Create a merge
> commit"),
> > > So
> > > > it's a better choice to disable the button directly.
> > > >
> > > > WDYT?
> > > >
> > > > --
> > > > Best Regards
> > > > Guangxu
> > > >
> > >
> >
>
>
> --
> Best Regards
> Guangxu
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by Guangxu Cheng <gx...@apache.org>.
Hi tison,
I have created an infra JIRA, see:
https://issues.apache.org/jira/browse/INFRA-19688
tison <wa...@gmail.com> 于2020年1月9日周四 下午12:52写道：
> @Guangxu,
>
> Sounds good. I think setting the configuration should be done by infra.
> Will create an infra JIRA for it.
>
> Best,
> tison.
>
>
> Goson zhang <go...@gmail.com> 于2020年1月9日周四 上午11:13写道：
>
> > +1
> >
> > Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 上午11:12写道：
> >
> > > Hi tison,
> > >
> > > Nice discussion, these merge commits is noisy.
> > >
> > > IIRC GitHub supports disabling this button ("Create a merge commit"),
> > So
> > > it's a better choice to disable the button directly.
> > >
> > > WDYT?
> > >
> > > --
> > > Best Regards
> > > Guangxu
> > >
> >
>
--
Best Regards
Guangxu
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by tison <wa...@gmail.com>.
@Guangxu,
Sounds good. I think setting the configuration should be done by infra.
Will create an infra JIRA for it.
Best,
tison.
Goson zhang <go...@gmail.com> 于2020年1月9日周四 上午11:13写道：
> +1
>
> Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 上午11:12写道：
>
> > Hi tison,
> >
> > Nice discussion, these merge commits is noisy.
> >
> > IIRC GitHub supports disabling this button ("Create a merge commit"),
> So
> > it's a better choice to disable the button directly.
> >
> > WDYT?
> >
> > --
> > Best Regards
> > Guangxu
> >
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by Goson zhang <go...@gmail.com>.
+1
Guangxu Cheng <gx...@apache.org> 于2020年1月9日周四 上午11:12写道：
> Hi tison,
>
> Nice discussion, these merge commits is noisy.
>
> IIRC GitHub supports disabling this button ("Create a merge commit"), So
> it's a better choice to disable the button directly.
>
> WDYT?
>
> --
> Best Regards
> Guangxu
>
Re: [DISCUSS] Prefer rebase and merge for patch/pr
Posted by Guangxu Cheng <gx...@apache.org>.
Hi tison,
Nice discussion, these merge commits is noisy.
IIRC GitHub supports disabling this button ("Create a merge commit"), So
it's a better choice to disable the button directly.
WDYT?
--
Best Regards
Guangxu