Re: [DISCUSS] MERGE REQUEST

2014-12-03 Thread Hugo Trippaers
Will, Sounds good, i need to discuss with Daan, but i’m tempted to follow this convention to see how it pans out. Cheers, Hugo On 3 dec. 2014, at 00:44, Will Stevens wstev...@cloudops.com wrote: I just posted a topic called: [MERGE REQUEST] hotfix/4.5-7959 This is a workflow that I am

Re: [DISCUSS] MERGE REQUEST

2014-12-03 Thread Rohit Yadav
Good idea Will, I've few more additions; - Don't merge bugfix to master (unless it's fixing a build etc.) - Do reviews on Github PR, test using Travis and/or Jenkins. - When the bugfix branch is good enough to be accepted on 4.5 (or previous branches), merge those branch to the forward

Re: [DISCUSS] MERGE REQUEST

2014-12-03 Thread Daan Hoogland
sounds good, we (@SBP) started working with reviews of the commit diffs for master. Sounds like this is compliant with yours. I kind of release branch 4.4 for this reason so under this condition it will again become more workable/less effort to control the stuff. On Wed, Dec 3, 2014 at 9:16 AM,

[DISCUSS] MERGE REQUEST

2014-12-02 Thread Will Stevens
I just posted a topic called: [MERGE REQUEST] hotfix/4.5-7959 This is a workflow that I am going to adopt and test out for a little while to see if it has real benefits. I have added some notes below as to why I decided to start doing this. This came out of a lot of conversations at CCCEU. I