Re: [VOTE] Using rebase and merge for feature branch development

2015-09-01 Thread Andrew Wang
With I believe 9 +1s (7 binding), the vote passes. Thanks all for voting and the very helpful discussion, I'll file a JIRA and get this content in a more accessible place. Best, Andrew On Tue, Aug 25, 2015 at 10:22 AM, Sangjin Lee wrote: > +1 (non-binding). > > Thanks, > Sangjin > > On Tue, Aug

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-25 Thread Sangjin Lee
+1 (non-binding). Thanks, Sangjin On Tue, Aug 25, 2015 at 10:13 AM, Ravi Prakash wrote: > +1. Thanks > > > > On Monday, August 24, 2015 3:02 PM, Jing Zhao > wrote: > > > +1. Thanks. > > On Mon, Aug 24, 2015 at 2:47 PM, Zhe Zhang wrote: > > > +1 non-binding. Thanks Andrew! > > > > --- >

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-25 Thread Ravi Prakash
+1. Thanks On Monday, August 24, 2015 3:02 PM, Jing Zhao wrote: +1. Thanks. On Mon, Aug 24, 2015 at 2:47 PM, Zhe Zhang wrote: > +1 non-binding. Thanks Andrew! > > --- > Zhe Zhang > > On Mon, Aug 24, 2015 at 2:38 PM, Karthik Kambatla > wrote: > > > +1 > > > > Thanks for driving t

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-24 Thread Jing Zhao
+1. Thanks. On Mon, Aug 24, 2015 at 2:47 PM, Zhe Zhang wrote: > +1 non-binding. Thanks Andrew! > > --- > Zhe Zhang > > On Mon, Aug 24, 2015 at 2:38 PM, Karthik Kambatla > wrote: > > > +1 > > > > Thanks for driving this, Andrew. > > > > On Mon, Aug 24, 2015 at 11:00 AM, Vinayakumar B > > > wrot

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-24 Thread Zhe Zhang
+1 non-binding. Thanks Andrew! --- Zhe Zhang On Mon, Aug 24, 2015 at 2:38 PM, Karthik Kambatla wrote: > +1 > > Thanks for driving this, Andrew. > > On Mon, Aug 24, 2015 at 11:00 AM, Vinayakumar B > wrote: > > > +1, > > > > -Vinay > > On Aug 24, 2015 11:29 PM, "Colin P. McCabe" wrote: > > > >

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-24 Thread Karthik Kambatla
+1 Thanks for driving this, Andrew. On Mon, Aug 24, 2015 at 11:00 AM, Vinayakumar B wrote: > +1, > > -Vinay > On Aug 24, 2015 11:29 PM, "Colin P. McCabe" wrote: > > > +1 > > > > cheers, > > Colin > > > > On Mon, Aug 24, 2015 at 10:04 AM, Steve Loughran > > > wrote: > > > +1 (binding) > > > >

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-24 Thread Vinayakumar B
+1, -Vinay On Aug 24, 2015 11:29 PM, "Colin P. McCabe" wrote: > +1 > > cheers, > Colin > > On Mon, Aug 24, 2015 at 10:04 AM, Steve Loughran > wrote: > > +1 (binding) > > > >> On 21 Aug 2015, at 13:44, Andrew Wang wrote: > >> > >> Hi common-dev, > >> > >> As promised, here is an official vote t

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-24 Thread Colin P. McCabe
+1 cheers, Colin On Mon, Aug 24, 2015 at 10:04 AM, Steve Loughran wrote: > +1 (binding) > >> On 21 Aug 2015, at 13:44, Andrew Wang wrote: >> >> Hi common-dev, >> >> As promised, here is an official vote thread. Let's run it for the standard >> 7 days, closing on Aug 28th at noon. Only PMC membe

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-24 Thread Steve Loughran
+1 (binding) > On 21 Aug 2015, at 13:44, Andrew Wang wrote: > > Hi common-dev, > > As promised, here is an official vote thread. Let's run it for the standard > 7 days, closing on Aug 28th at noon. Only PMC members have binding votes, > but of course everyone's input is welcomed. > > If the vo

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-21 Thread Sangjin Lee
Understood, and agreed on the need to preserve the commit history. The only reason I thought I'd comment is that the current proposal explicitly mentions "git merge --no-ff" when merging the branch to trunk. "--squash" cannot be combined with "--no-ff", thus I wanted some clarification. On Fri, Au

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-21 Thread Andrew Wang
> > I know this is a different topic than the main reason for this vote, but > has there been a discussion of using a squashed merge as opposed to a > normal merge when feature branches merge to trunk? Squash merges have some > advantages including complicating the branch tree. > Since this [VOTE]

Re: [VOTE] Using rebase and merge for feature branch development

2015-08-21 Thread Sangjin Lee
On Fri, Aug 21, 2015 at 1:44 PM, Andrew Wang wrote: > Hi common-dev, > > As promised, here is an official vote thread. Let's run it for the standard > 7 days, closing on Aug 28th at noon. Only PMC members have binding votes, > but of course everyone's input is welcomed. > > If the vote passes, I'

[VOTE] Using rebase and merge for feature branch development

2015-08-21 Thread Andrew Wang
Hi common-dev, As promised, here is an official vote thread. Let's run it for the standard 7 days, closing on Aug 28th at noon. Only PMC members have binding votes, but of course everyone's input is welcomed. If the vote passes, I'll put the text on the website somewhere as recommended by Steve.