Re: Merges to Myriad master branch

2015-12-01 Thread Darin Johnson
I like Adam's idea for RCs, but I also really like the idea of a 0.1.0 branch for bug fixes. That way we can cut a 0.1.1 maintenance release much easier than trying to cut off master. Seems like a lot of apache projects handle it that way. Darin Otherwise there will likely be some really ugly

Re: Merges to Myriad master branch

2015-11-30 Thread Adam Bordelon
Sounds like a code freeze/thaw. What are the conditions for a *major* PR? Even a minor PR could introduce major bugs. I will point out that you have the option of cherry-picking specific new patches on top of the 0.1.0-rc3 tag to create a new rc. This ensures that 0.1.0 only includes changes that

Re: Merges to Myriad master branch

2015-11-30 Thread Santosh Marella
Thanks Adam. If there is a way to cherry pick and apply commits to tags (as opposed to branches), we should probably do that. I will read more about it. Santosh On Mon, Nov 30, 2015 at 1:49 PM, Adam Bordelon wrote: > Sounds like a code freeze/thaw. What are the conditions

Re: Merges to Myriad master branch

2015-11-30 Thread Luciano Resende
On Mon, Nov 30, 2015 at 1:49 PM, Adam Bordelon wrote: > Sounds like a code freeze/thaw. What are the conditions for a *major* PR? > Even a minor PR could introduce major bugs. > I will point out that you have the option of cherry-picking specific new > patches on top of the