Re: github rebase merging

2016-09-26 Thread James Peach
: James Peach [mailto:jpe...@apache.org] > Sent: Monday, September 26, 2016 2:37 PM > To: dev@trafficserver.apache.org > Subject: Re: github rebase merging > > >> On Sep 26, 2016, at 12:24 PM, Leif Hedstrom wrote: >> >>> >>> On Sep 26, 2016, at 12:34 PM

RE: github rebase merging

2016-09-26 Thread Chou, Peter
d-merging so no merge commit). Thanks, Peter -Original Message- From: James Peach [mailto:jpe...@apache.org] Sent: Monday, September 26, 2016 2:37 PM To: dev@trafficserver.apache.org Subject: Re: github rebase merging > On Sep 26, 2016, at 12:24 PM, Leif Hedstrom wrote: > >>

Re: github rebase merging

2016-09-26 Thread James Peach
> On Sep 26, 2016, at 12:24 PM, Leif Hedstrom wrote: > >> >> On Sep 26, 2016, at 12:34 PM, Bryan Call wrote: >> >> +1 - Glad to see they are doing this. >> >> -Bryan >> >> >> >> >>> On Sep 26, 2016, at 11:27 AM, James Peach wrote: >>> >>> Hi all, >>> >>> Github just released a new "re

Re: github rebase merging

2016-09-26 Thread Leif Hedstrom
> On Sep 26, 2016, at 12:34 PM, Bryan Call wrote: > > +1 - Glad to see they are doing this. > > -Bryan > > > > >> On Sep 26, 2016, at 11:27 AM, James Peach wrote: >> >> Hi all, >> >> Github just released a new "rebase merging" feature, which makes merging PRs >> as clean as doing the me

Re: github rebase merging

2016-09-26 Thread Bryan Call
+1 - Glad to see they are doing this. -Bryan > On Sep 26, 2016, at 11:27 AM, James Peach wrote: > > Hi all, > > Github just released a new "rebase merging" feature, which makes merging PRs > as clean as doing the merge by hand. See > https://github.com/blog/2243-rebase-and-merge-pull-requ

Re: github rebase merging

2016-09-26 Thread Alan Carroll
I already merge pull requests by hand whenever possible already to avoid the "MERGE" button in github. On Monday, September 26, 2016 1:29 PM, Phil Sorber wrote: +1 On Mon, Sep 26, 2016 at 12:28 PM James Peach wrote: > Hi all, > > Github just released a new "rebase merging" feature,

Re: github rebase merging

2016-09-26 Thread Phil Sorber
+1 On Mon, Sep 26, 2016 at 12:28 PM James Peach wrote: > Hi all, > > Github just released a new "rebase merging" feature, which makes merging > PRs as clean as doing the merge by hand. See > https://github.com/blog/2243-rebase-and-merge-pull-requests. > > I'd like to propose that we always "reba

github rebase merging

2016-09-26 Thread James Peach
Hi all, Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests. I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, b