You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@oodt.apache.org by Tom Barber <to...@meteorite.bi> on 2015/09/21 23:34:34 UTC
Merge Github pull requests
Chris or anyone else who may know
Do we have any docs on merging github pull requests?
I've found some stuff for other projects but I don't know if it applies to
OODT.
It would be far easier for me on no trunk branches if I could merge my own
Pull Requests so I can test my changes on Jenkins without having to wait.
Thanks
Tom
Re: Merge Github pull requests
Posted by Tom Barber <to...@meteorite.bi>.
Aye boss, git all the way! ;)
Thanks Chris.
Tom
On Tue, Sep 22, 2015 at 10:30 PM, Chris Mattmann <ch...@gmail.com>
wrote:
> I will also write a quick wiki page that shows the
> workflow for merging Github commits. Right now it’s
> still SVN and can be done you just have to know what
> to put in the commit messages and how to use git apply.
>
> But yes, let’s actually VOTE on git. If no one beats me
> to it, I’ll call the VOTE tonight.
>
> —
> Chris Mattmann
> chris.mattmann@gmail.com
>
>
>
>
>
>
> -----Original Message-----
> From: Lewis John Mcgibbney <le...@gmail.com>
> Reply-To: <de...@oodt.apache.org>
> Date: Tuesday, September 22, 2015 at 2:29 PM
> To: "dev@oodt.apache.org" <de...@oodt.apache.org>
> Subject: Re: Merge Github pull requests
>
> >Hi Tom,
> >Probably a good time to reignite the convo on switching to Git for SCM?
> >WDYT?
> >For previous reference, the thread where we discussed this can be found
> >below
> >http://www.mail-archive.com/dev%40oodt.apache.org/msg05779.html
> >Lewis
> >
> >On Mon, Sep 21, 2015 at 2:34 PM, Tom Barber <to...@meteorite.bi>
> >wrote:
> >
> >> Chris or anyone else who may know
> >>
> >> Do we have any docs on merging github pull requests?
> >>
> >> I've found some stuff for other projects but I don't know if it applies
> >>to
> >> OODT.
> >>
> >> It would be far easier for me on no trunk branches if I could merge my
> >>own
> >> Pull Requests so I can test my changes on Jenkins without having to
> >>wait.
> >>
> >> Thanks
> >>
> >> Tom
> >>
> >
> >
> >
> >--
> >*Lewis*
>
>
>
Re: Merge Github pull requests
Posted by Tom Barber <to...@meteorite.bi>.
Assuming the vote passes going back to my mail on the OCW ML, I would
seriously consider the Git Flow method once we get transitioned. I don't
know if anyone has any idea what I'm talking about but it certainly helps
distributed, and also onsite teams, release more stable code from my
experience.
http://nvie.com/posts/a-successful-git-branching-model/
Clearly we can discuss this further later, just putting it out there! :)
Tom
On Wed, Sep 23, 2015 at 6:10 AM, Chris Mattmann <ch...@gmail.com>
wrote:
> Thanks Lewis
>
> —
> Chris Mattmann
> chris.mattmann@gmail.com
>
>
>
>
>
>
> -----Original Message-----
> From: Lewis John Mcgibbney <le...@gmail.com>
> Reply-To: <de...@oodt.apache.org>
> Date: Tuesday, September 22, 2015 at 5:36 PM
> To: "dev@oodt.apache.org" <de...@oodt.apache.org>
> Subject: Re: Merge Github pull requests
>
> >VOTE's out.
> >
> >On Tue, Sep 22, 2015 at 2:30 PM, Chris Mattmann <chris.mattmann@gmail.com
> >
> >wrote:
> >
> >> I will also write a quick wiki page that shows the
> >> workflow for merging Github commits. Right now it’s
> >> still SVN and can be done you just have to know what
> >> to put in the commit messages and how to use git apply.
> >>
> >> But yes, let’s actually VOTE on git. If no one beats me
> >> to it, I’ll call the VOTE tonight.
> >>
> >> —
> >> Chris Mattmann
> >> chris.mattmann@gmail.com
> >>
> >>
> >>
> >>
> >>
> >>
> >> -----Original Message-----
> >> From: Lewis John Mcgibbney <le...@gmail.com>
> >> Reply-To: <de...@oodt.apache.org>
> >> Date: Tuesday, September 22, 2015 at 2:29 PM
> >> To: "dev@oodt.apache.org" <de...@oodt.apache.org>
> >> Subject: Re: Merge Github pull requests
> >>
> >> >Hi Tom,
> >> >Probably a good time to reignite the convo on switching to Git for SCM?
> >> >WDYT?
> >> >For previous reference, the thread where we discussed this can be found
> >> >below
> >> >http://www.mail-archive.com/dev%40oodt.apache.org/msg05779.html
> >> >Lewis
> >> >
> >> >On Mon, Sep 21, 2015 at 2:34 PM, Tom Barber <to...@meteorite.bi>
> >> >wrote:
> >> >
> >> >> Chris or anyone else who may know
> >> >>
> >> >> Do we have any docs on merging github pull requests?
> >> >>
> >> >> I've found some stuff for other projects but I don't know if it
> >>applies
> >> >>to
> >> >> OODT.
> >> >>
> >> >> It would be far easier for me on no trunk branches if I could merge
> >>my
> >> >>own
> >> >> Pull Requests so I can test my changes on Jenkins without having to
> >> >>wait.
> >> >>
> >> >> Thanks
> >> >>
> >> >> Tom
> >> >>
> >> >
> >> >
> >> >
> >> >--
> >> >*Lewis*
> >>
> >>
> >>
> >
> >
> >--
> >*Lewis*
>
>
>
Re: Merge Github pull requests
Posted by Chris Mattmann <ch...@gmail.com>.
Thanks Lewis
—
Chris Mattmann
chris.mattmann@gmail.com
-----Original Message-----
From: Lewis John Mcgibbney <le...@gmail.com>
Reply-To: <de...@oodt.apache.org>
Date: Tuesday, September 22, 2015 at 5:36 PM
To: "dev@oodt.apache.org" <de...@oodt.apache.org>
Subject: Re: Merge Github pull requests
>VOTE's out.
>
>On Tue, Sep 22, 2015 at 2:30 PM, Chris Mattmann <ch...@gmail.com>
>wrote:
>
>> I will also write a quick wiki page that shows the
>> workflow for merging Github commits. Right now it’s
>> still SVN and can be done you just have to know what
>> to put in the commit messages and how to use git apply.
>>
>> But yes, let’s actually VOTE on git. If no one beats me
>> to it, I’ll call the VOTE tonight.
>>
>> —
>> Chris Mattmann
>> chris.mattmann@gmail.com
>>
>>
>>
>>
>>
>>
>> -----Original Message-----
>> From: Lewis John Mcgibbney <le...@gmail.com>
>> Reply-To: <de...@oodt.apache.org>
>> Date: Tuesday, September 22, 2015 at 2:29 PM
>> To: "dev@oodt.apache.org" <de...@oodt.apache.org>
>> Subject: Re: Merge Github pull requests
>>
>> >Hi Tom,
>> >Probably a good time to reignite the convo on switching to Git for SCM?
>> >WDYT?
>> >For previous reference, the thread where we discussed this can be found
>> >below
>> >http://www.mail-archive.com/dev%40oodt.apache.org/msg05779.html
>> >Lewis
>> >
>> >On Mon, Sep 21, 2015 at 2:34 PM, Tom Barber <to...@meteorite.bi>
>> >wrote:
>> >
>> >> Chris or anyone else who may know
>> >>
>> >> Do we have any docs on merging github pull requests?
>> >>
>> >> I've found some stuff for other projects but I don't know if it
>>applies
>> >>to
>> >> OODT.
>> >>
>> >> It would be far easier for me on no trunk branches if I could merge
>>my
>> >>own
>> >> Pull Requests so I can test my changes on Jenkins without having to
>> >>wait.
>> >>
>> >> Thanks
>> >>
>> >> Tom
>> >>
>> >
>> >
>> >
>> >--
>> >*Lewis*
>>
>>
>>
>
>
>--
>*Lewis*
Re: Merge Github pull requests
Posted by Lewis John Mcgibbney <le...@gmail.com>.
VOTE's out.
On Tue, Sep 22, 2015 at 2:30 PM, Chris Mattmann <ch...@gmail.com>
wrote:
> I will also write a quick wiki page that shows the
> workflow for merging Github commits. Right now it’s
> still SVN and can be done you just have to know what
> to put in the commit messages and how to use git apply.
>
> But yes, let’s actually VOTE on git. If no one beats me
> to it, I’ll call the VOTE tonight.
>
> —
> Chris Mattmann
> chris.mattmann@gmail.com
>
>
>
>
>
>
> -----Original Message-----
> From: Lewis John Mcgibbney <le...@gmail.com>
> Reply-To: <de...@oodt.apache.org>
> Date: Tuesday, September 22, 2015 at 2:29 PM
> To: "dev@oodt.apache.org" <de...@oodt.apache.org>
> Subject: Re: Merge Github pull requests
>
> >Hi Tom,
> >Probably a good time to reignite the convo on switching to Git for SCM?
> >WDYT?
> >For previous reference, the thread where we discussed this can be found
> >below
> >http://www.mail-archive.com/dev%40oodt.apache.org/msg05779.html
> >Lewis
> >
> >On Mon, Sep 21, 2015 at 2:34 PM, Tom Barber <to...@meteorite.bi>
> >wrote:
> >
> >> Chris or anyone else who may know
> >>
> >> Do we have any docs on merging github pull requests?
> >>
> >> I've found some stuff for other projects but I don't know if it applies
> >>to
> >> OODT.
> >>
> >> It would be far easier for me on no trunk branches if I could merge my
> >>own
> >> Pull Requests so I can test my changes on Jenkins without having to
> >>wait.
> >>
> >> Thanks
> >>
> >> Tom
> >>
> >
> >
> >
> >--
> >*Lewis*
>
>
>
--
*Lewis*
Re: Merge Github pull requests
Posted by Chris Mattmann <ch...@gmail.com>.
I will also write a quick wiki page that shows the
workflow for merging Github commits. Right now it’s
still SVN and can be done you just have to know what
to put in the commit messages and how to use git apply.
But yes, let’s actually VOTE on git. If no one beats me
to it, I’ll call the VOTE tonight.
—
Chris Mattmann
chris.mattmann@gmail.com
-----Original Message-----
From: Lewis John Mcgibbney <le...@gmail.com>
Reply-To: <de...@oodt.apache.org>
Date: Tuesday, September 22, 2015 at 2:29 PM
To: "dev@oodt.apache.org" <de...@oodt.apache.org>
Subject: Re: Merge Github pull requests
>Hi Tom,
>Probably a good time to reignite the convo on switching to Git for SCM?
>WDYT?
>For previous reference, the thread where we discussed this can be found
>below
>http://www.mail-archive.com/dev%40oodt.apache.org/msg05779.html
>Lewis
>
>On Mon, Sep 21, 2015 at 2:34 PM, Tom Barber <to...@meteorite.bi>
>wrote:
>
>> Chris or anyone else who may know
>>
>> Do we have any docs on merging github pull requests?
>>
>> I've found some stuff for other projects but I don't know if it applies
>>to
>> OODT.
>>
>> It would be far easier for me on no trunk branches if I could merge my
>>own
>> Pull Requests so I can test my changes on Jenkins without having to
>>wait.
>>
>> Thanks
>>
>> Tom
>>
>
>
>
>--
>*Lewis*
Re: Merge Github pull requests
Posted by Lewis John Mcgibbney <le...@gmail.com>.
Hi Tom,
Probably a good time to reignite the convo on switching to Git for SCM?
WDYT?
For previous reference, the thread where we discussed this can be found
below
http://www.mail-archive.com/dev%40oodt.apache.org/msg05779.html
Lewis
On Mon, Sep 21, 2015 at 2:34 PM, Tom Barber <to...@meteorite.bi> wrote:
> Chris or anyone else who may know
>
> Do we have any docs on merging github pull requests?
>
> I've found some stuff for other projects but I don't know if it applies to
> OODT.
>
> It would be far easier for me on no trunk branches if I could merge my own
> Pull Requests so I can test my changes on Jenkins without having to wait.
>
> Thanks
>
> Tom
>
--
*Lewis*