Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-09 Thread tison
Thanks for your update! Best, tison. Guangxu Cheng 于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

2020-01-09 Thread Guangxu Cheng
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

2020-01-09 Thread tison
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 于2020年1月9日周四 下午1:36写道: > Thanks! > > Best, > tison. > > > Guangxu Cheng 于2020年1月9日周四 下午1

Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread tison
Thanks! Best, tison. Guangxu Cheng 于2020年1月9日周四 下午1:25写道: > Hi tison, > >I have created an infra JIRA, see: > >https://issues.apache.org/jira/browse/INFRA-19688 > > tison 于2020年1月9日周四 下午12:52写道: > > > @Guangxu, > > > > Sounds good. I think setting the configuration should be done by i

Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread Guangxu Cheng
Hi tison, I have created an infra JIRA, see: https://issues.apache.org/jira/browse/INFRA-19688 tison 于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 于

Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread tison
@Guangxu, Sounds good. I think setting the configuration should be done by infra. Will create an infra JIRA for it. Best, tison. Goson zhang 于2020年1月9日周四 上午11:13写道: > +1 > > Guangxu Cheng 于2020年1月9日周四 上午11:12写道: > > > Hi tison, > > > > Nice discussion, these merge commits is noisy. > > > >

Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread Goson zhang
+1 Guangxu Cheng 于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

2020-01-08 Thread Guangxu Cheng
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

答复: [DISCUSS] Prefer rebase and merge for patch/pr(Internet mail)

2020-01-08 Thread 李致波
+1 -邮件原件- 发件人: lamber liu 发送时间: 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 wrote: > Hi developers, > > Recently I notice that the commit history contains a number

Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread lamber liu
+1 On Thu, Jan 9, 2020 at 10:39 AM tison 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 the

Re: [DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread kaynewu
+1 tison 于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 object

[DISCUSS] Prefer rebase and merge for patch/pr

2020-01-08 Thread tison
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 p