Merge guidelines / policies

[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
https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines
 ?

More specifically, I have the following questions:
- Who merges what? Are we supposed to merge our own pull requests or the
issues we are familiar with? For example, will I have to take care of
Andra's and Daniel's issues?
- When do you merge things? I understand there is a process of review and a
change needs to be approved. But, by how many people? For how long?
- Do you merge individual issues or do you batch them somehow?
- Do you use the scripts mentioned here
<https://flink.apache.org/how-to-contribute.html#how-to-become-a-committer> or
something else?

Thank you!

Cheers,
Vasia.

[Fabian Hueske-2]

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 committer gives a +1 or the
change is trivial.
- I merge manually on the command line using git rebase and git merge.
Batches and individual changes are both OK, but I wait until the all merged
changes build on Travis before I push them to the Apache Git repository.

Cheers, Fabian


2015-02-11 16:41 GMT+01:00 Vasiliki Kalavri <[hidden email]>:

> 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
>
> https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines
>  ?
>
> More specifically, I have the following questions:
> - Who merges what? Are we supposed to merge our own pull requests or the
> issues we are familiar with? For example, will I have to take care of
> Andra's and Daniel's issues?
> - When do you merge things? I understand there is a process of review and a
> change needs to be approved. But, by how many people? For how long?
> - Do you merge individual issues or do you batch them somehow?
> - Do you use the scripts mentioned here
> <https://flink.apache.org/how-to-contribute.html#how-to-become-a-committer>
> or
> something else?
>
> Thank you!
>
> Cheers,
> Vasia.
>

[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 <[hidden email]> wrote:

> 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 committer gives a +1 or the
> change is trivial.
> - I merge manually on the command line using git rebase and git merge.
> Batches and individual changes are both OK, but I wait until the all merged
> changes build on Travis before I push them to the Apache Git repository.
>
> Cheers, Fabian
>
>
> 2015-02-11 16:41 GMT+01:00 Vasiliki Kalavri <[hidden email]>:
>
> > 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
> >
> >
> https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines
> >  ?
> >
> > More specifically, I have the following questions:
> > - Who merges what? Are we supposed to merge our own pull requests or the
> > issues we are familiar with? For example, will I have to take care of
> > Andra's and Daniel's issues?
> > - When do you merge things? I understand there is a process of review
> and a
> > change needs to be approved. But, by how many people? For how long?
> > - Do you merge individual issues or do you batch them somehow?
> > - Do you use the scripts mentioned here
> > <
> https://flink.apache.org/how-to-contribute.html#how-to-become-a-committer>
> > or
> > something else?
> >
> > Thank you!
> >
> > Cheers,
> > Vasia.
> >
>

[Aljoscha Krettek-2]

Same here...

On Wed, Feb 11, 2015 at 5:13 PM, Stephan Ewen <[hidden email]> 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, 2015 at 5:06 PM, Fabian Hueske <[hidden email]> wrote:
>
>> 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 committer gives a +1 or the
>> change is trivial.
>> - I merge manually on the command line using git rebase and git merge.
>> Batches and individual changes are both OK, but I wait until the all merged
>> changes build on Travis before I push them to the Apache Git repository.
>>
>> Cheers, Fabian
>>
>>
>> 2015-02-11 16:41 GMT+01:00 Vasiliki Kalavri <[hidden email]>:
>>
>> > 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
>> >
>> >
>> https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines
>> >  ?
>> >
>> > More specifically, I have the following questions:
>> > - Who merges what? Are we supposed to merge our own pull requests or the
>> > issues we are familiar with? For example, will I have to take care of
>> > Andra's and Daniel's issues?
>> > - When do you merge things? I understand there is a process of review
>> and a
>> > change needs to be approved. But, by how many people? For how long?
>> > - Do you merge individual issues or do you batch them somehow?
>> > - Do you use the scripts mentioned here
>> > <
>> https://flink.apache.org/how-to-contribute.html#how-to-become-a-committer>
>> > or
>> > something else?
>> >
>> > Thank you!
>> >
>> > Cheers,
>> > Vasia.
>> >
>>

[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, Aljoscha Krettek <[hidden email]> wrote:

> Same here...
>
> On Wed, Feb 11, 2015 at 5:13 PM, Stephan Ewen <[hidden email]> 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, 2015 at 5:06 PM, Fabian Hueske <[hidden email]>
> wrote:
> >
> >> 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 committer gives a +1 or the
> >> change is trivial.
> >> - I merge manually on the command line using git rebase and git merge.
> >> Batches and individual changes are both OK, but I wait until the all
> merged
> >> changes build on Travis before I push them to the Apache Git repository.
> >>
> >> Cheers, Fabian
> >>
> >>
> >> 2015-02-11 16:41 GMT+01:00 Vasiliki Kalavri <[hidden email]
> >:
> >>
> >> > 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
> >> >
> >> >
> >>
> https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines
> >> >  ?
> >> >
> >> > More specifically, I have the following questions:
> >> > - Who merges what? Are we supposed to merge our own pull requests or
> the
> >> > issues we are familiar with? For example, will I have to take care of
> >> > Andra's and Daniel's issues?
> >> > - When do you merge things? I understand there is a process of review
> >> and a
> >> > change needs to be approved. But, by how many people? For how long?
> >> > - Do you merge individual issues or do you batch them somehow?
> >> > - Do you use the scripts mentioned here
> >> > <
> >>
> https://flink.apache.org/how-to-contribute.html#how-to-become-a-committer>
> >> > or
> >> > something else?
> >> >
> >> > Thank you!
> >> >
> >> > Cheers,
> >> > Vasia.
> >> >
> >>
>

[Fabian Hueske-2]

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 rebase, build, test, and try again ;-)

As the commit activity on the master increases, some more coordination
might help.
IMO, the IRC channel would be a way to tell others about ongoing merge
activities.
But as you said, so far everything works quite well.


2015-02-11 21:15 GMT+01:00 Vasiliki Kalavri <[hidden email]>:

> 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, Aljoscha Krettek <[hidden email]>
> wrote:
>
> > Same here...
> >
> > On Wed, Feb 11, 2015 at 5:13 PM, Stephan Ewen <[hidden email]> 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, 2015 at 5:06 PM, Fabian Hueske <[hidden email]>
> > wrote:
> > >
> > >> 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 committer gives a +1 or the
> > >> change is trivial.
> > >> - I merge manually on the command line using git rebase and git merge.
> > >> Batches and individual changes are both OK, but I wait until the all
> > merged
> > >> changes build on Travis before I push them to the Apache Git
> repository.
> > >>
> > >> Cheers, Fabian
> > >>
> > >>
> > >> 2015-02-11 16:41 GMT+01:00 Vasiliki Kalavri <
> [hidden email]
> > >:
> > >>
> > >> > 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
> > >> >
> > >> >
> > >>
> >
> https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+development+guidelines
> > >> >  ?
> > >> >
> > >> > More specifically, I have the following questions:
> > >> > - Who merges what? Are we supposed to merge our own pull requests or
> > the
> > >> > issues we are familiar with? For example, will I have to take care
> of
> > >> > Andra's and Daniel's issues?
> > >> > - When do you merge things? I understand there is a process of
> review
> > >> and a
> > >> > change needs to be approved. But, by how many people? For how long?
> > >> > - Do you merge individual issues or do you batch them somehow?
> > >> > - Do you use the scripts mentioned here
> > >> > <
> > >>
> >
> https://flink.apache.org/how-to-contribute.html#how-to-become-a-committer>
> > >> > or
> > >> > something else?
> > >> >
> > >> > Thank you!
> > >> >
> > >> > Cheers,
> > >> > Vasia.
> > >> >
> > >>
> >
>