Re: Merge guidelines / policies

2015-02-11 Thread Fabian Hueske
I haven't seen conflicts in terms of who is merging a specific PR, yet. I add a short comment in the PR before starting to merge, if I fear that somebody else might pick up the same one. What can happen though is that the master changed while preparing a merge. In that case you simply need to reba

Re: Merge guidelines / policies

2015-02-11 Thread Vasiliki Kalavri
I see. Thanks for the replies guys! I was just wondering how you manage not to get in conflicts or how you decide who's responsible for what. It seems that what you're doing works fine so far, so I'll try to do the same. If in doubt, I will ask again ;) Cheers, -V. On 11 February 2015 at 17:52,

Re: Merge guidelines / policies

2015-02-11 Thread Aljoscha Krettek
Same here... On Wed, Feb 11, 2015 at 5:13 PM, Stephan Ewen wrote: > I think there are not yet any guidelines, other than what is here ( > https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines > ) > > I do it pretty much the same way as Fabian... > > On Wed, Feb 11,

Re: Merge guidelines / policies

2015-02-11 Thread Stephan Ewen
I think there are not yet any guidelines, other than what is here ( https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines ) I do it pretty much the same way as Fabian... On Wed, Feb 11, 2015 at 5:06 PM, Fabian Hueske wrote: > Hi Vasia, > > AFAIK, there is no merg

Re: Merge guidelines / policies

2015-02-11 Thread Fabian Hueske
Hi Vasia, AFAIK, there is no merging guide for committers. I am doing this as follows: - I am merging only code for components that I know well or where I am sure to know the implications. - If in doubt, I wait until another committer gives a +1 - I am merging my own code only if another committe

Merge guidelines / policies

2015-02-11 Thread Vasiliki Kalavri
Hello beautiful Flink people, now that Gelly is in and I have moved to JIRA all our work-in-progress issues, I feel I need to clarify some doubts I have :) Basically, I was wondering whether there are guidelines or any kind of policy regarding merging changes. Something similar to this maybe http