You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@storm.apache.org by "P. Taylor Goetz" <pt...@gmail.com> on 2016/05/20 17:08:25 UTC
Merging to Multiple Branches
Committers, when merging patches to multiple branches please make a note either in the associated JIRA or pull request (which will get mirrored to JIRA) which branches it was merged to. This makes tracking which branches a patch landed in a lot easier.
I think most of us are in the habit of doing so, but it would help if we were all consistent.
Thanks!
-Taylor
Re: Merging to Multiple Branches
Posted by Jungtaek Lim <ka...@gmail.com>.
Actually I'm trying to get to it, but have been thinking we need to talk
about commit policy first.
As some of us may know, several projects (Kafka, Zeppelin, and maybe
more?) just pick Spark pr merge script and modify if needed, but it's based
on similar merge policy. We're having very different merging process so we
need to build our own if we want to keep it as is.
- Jungtaek Lim (HeartSaVioR)
On Monday, May 23, 2016, Bobby Evans <ev...@yahoo-inc.com.invalid> wrote:
> I filed https://issues.apache.org/jira/browse/STORM-1490 for this, but
> never found time to get to it, so I just unassigned myself from it. If
> someone else wants to pick it up and take it across the finish line that
> would be awesome.
> - Bobby
>
> On Monday, May 23, 2016 12:12 AM, Manu Zhang <owenzhang1990@gmail.com
> <javascript:;>> wrote:
>
>
> maybe use scripts like
> https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py
> to automatically do so
>
> On Sat, May 21, 2016 at 1:48 AM Aaron.Dossett <Aaron.Dossett@target.com
> <javascript:;>>
> wrote:
>
> > Is there a best practice for merging a PR to multiple branches? I have
> > struggled with that in the past, probably due to shortcomings in my
> > knowledge of git. I¹d be happy to aggregate suggestions and put them on
> > the Developer page. Thanks!
> >
> > On 5/20/16, 12:08 PM, "P. Taylor Goetz" <ptgoetz@gmail.com
> <javascript:;>> wrote:
> >
> > >Committers, when merging patches to multiple branches please make a note
> > >either in the associated JIRA or pull request (which will get mirrored
> to
> > >JIRA) which branches it was merged to. This makes tracking which
> branches
> > >a patch landed in a lot easier.
> > >
> > >I think most of us are in the habit of doing so, but it would help if we
> > >were all consistent.
> > >
> > >Thanks!
> > >
> > >-Taylor
> >
> >
>
>
--
Name : Jungtaek Lim
Blog : http://medium.com/@heartsavior
Twitter : http://twitter.com/heartsavior
LinkedIn : http://www.linkedin.com/in/heartsavior
Re: Merging to Multiple Branches
Posted by Bobby Evans <ev...@yahoo-inc.com.INVALID>.
I filed https://issues.apache.org/jira/browse/STORM-1490 for this, but never found time to get to it, so I just unassigned myself from it. If someone else wants to pick it up and take it across the finish line that would be awesome.
- Bobby
On Monday, May 23, 2016 12:12 AM, Manu Zhang <ow...@gmail.com> wrote:
maybe use scripts like
https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py
to automatically do so
On Sat, May 21, 2016 at 1:48 AM Aaron.Dossett <Aa...@target.com>
wrote:
> Is there a best practice for merging a PR to multiple branches? I have
> struggled with that in the past, probably due to shortcomings in my
> knowledge of git. I¹d be happy to aggregate suggestions and put them on
> the Developer page. Thanks!
>
> On 5/20/16, 12:08 PM, "P. Taylor Goetz" <pt...@gmail.com> wrote:
>
> >Committers, when merging patches to multiple branches please make a note
> >either in the associated JIRA or pull request (which will get mirrored to
> >JIRA) which branches it was merged to. This makes tracking which branches
> >a patch landed in a lot easier.
> >
> >I think most of us are in the habit of doing so, but it would help if we
> >were all consistent.
> >
> >Thanks!
> >
> >-Taylor
>
>
Re: Merging to Multiple Branches
Posted by Manu Zhang <ow...@gmail.com>.
maybe use scripts like
https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py
to automatically do so
On Sat, May 21, 2016 at 1:48 AM Aaron.Dossett <Aa...@target.com>
wrote:
> Is there a best practice for merging a PR to multiple branches? I have
> struggled with that in the past, probably due to shortcomings in my
> knowledge of git. I¹d be happy to aggregate suggestions and put them on
> the Developer page. Thanks!
>
> On 5/20/16, 12:08 PM, "P. Taylor Goetz" <pt...@gmail.com> wrote:
>
> >Committers, when merging patches to multiple branches please make a note
> >either in the associated JIRA or pull request (which will get mirrored to
> >JIRA) which branches it was merged to. This makes tracking which branches
> >a patch landed in a lot easier.
> >
> >I think most of us are in the habit of doing so, but it would help if we
> >were all consistent.
> >
> >Thanks!
> >
> >-Taylor
>
>
Re: Merging to Multiple Branches
Posted by "Aaron.Dossett" <Aa...@target.com>.
Is there a best practice for merging a PR to multiple branches? I have
struggled with that in the past, probably due to shortcomings in my
knowledge of git. I¹d be happy to aggregate suggestions and put them on
the Developer page. Thanks!
On 5/20/16, 12:08 PM, "P. Taylor Goetz" <pt...@gmail.com> wrote:
>Committers, when merging patches to multiple branches please make a note
>either in the associated JIRA or pull request (which will get mirrored to
>JIRA) which branches it was merged to. This makes tracking which branches
>a patch landed in a lot easier.
>
>I think most of us are in the habit of doing so, but it would help if we
>were all consistent.
>
>Thanks!
>
>-Taylor