blackberry10 merge begun

[Lorin Beer <lo...@gmail.com>]

before the merge future/master merge happens, I'm pulling in all the
redirected pull requests https://github.com/apache/cordova-blackberry/pulls

and tracking the progress here:
https://issues.apache.org/jira/browse/CB-3382#comment-13656385

Re: blackberry10 merge begun

[Lorin Beer <lo...@gmail.com>]

looks like I pushed from the wrong branch. Not allowed to rewind, fixing
this now.


On Tue, May 14, 2013 at 9:57 AM, Lorin Beer <lo...@gmail.com>wrote:

> I'm not to sure what happened with docs, I'll revise right away
>
>
> On Tue, May 14, 2013 at 7:21 AM, Bryan Higgins <bh...@blackberry.com>wrote:
>
>> thanks, cordova-blackberry looks good, but the docs changes didn't get
>> merged in cleanly. I see merge artifacts in getting started and plugin
>> development.
>>
>>
>> On Mon, May 13, 2013 at 5:30 PM, Lorin Beer <lorin.beer.dev@gmail.com
>> >wrote:
>>
>> > yes, I believe I have resolved all the ones that were marked as ready to
>> > pull in. I'm stepping out of the office, but when I'm back I'll do the
>> > merge into master.
>> >
>> >
>> >
>> > On Mon, May 13, 2013 at 2:20 PM, Bryan Higgins <bryan@bryanhiggins.net
>> > >wrote:
>> >
>> > > Thanks Lorin!
>> > >
>> > > A few of those are still "in progress" as they have unresolved
>> feedback
>> > or
>> > > are untested.
>> > >
>> > > I will get them closed and re-opened against master once the merge is
>> > > complete.
>> > >
>> > >
>> > > On Mon, May 13, 2013 at 5:16 PM, Lorin Beer <lorin.beer.dev@gmail.com
>> > > >wrote:
>> > >
>> > > > before the merge future/master merge happens, I'm pulling in all the
>> > > > redirected pull requests
>> > > > https://github.com/apache/cordova-blackberry/pulls
>> > > >
>> > > > and tracking the progress here:
>> > > > https://issues.apache.org/jira/browse/CB-3382#comment-13656385
>> > > >
>> > >
>> >
>>
>
>

Re: blackberry10 merge begun

[Lorin Beer <lo...@gmail.com>]

I'm not to sure what happened with docs, I'll revise right away


On Tue, May 14, 2013 at 7:21 AM, Bryan Higgins <bh...@blackberry.com>wrote:

> thanks, cordova-blackberry looks good, but the docs changes didn't get
> merged in cleanly. I see merge artifacts in getting started and plugin
> development.
>
>
> On Mon, May 13, 2013 at 5:30 PM, Lorin Beer <lorin.beer.dev@gmail.com
> >wrote:
>
> > yes, I believe I have resolved all the ones that were marked as ready to
> > pull in. I'm stepping out of the office, but when I'm back I'll do the
> > merge into master.
> >
> >
> >
> > On Mon, May 13, 2013 at 2:20 PM, Bryan Higgins <bryan@bryanhiggins.net
> > >wrote:
> >
> > > Thanks Lorin!
> > >
> > > A few of those are still "in progress" as they have unresolved feedback
> > or
> > > are untested.
> > >
> > > I will get them closed and re-opened against master once the merge is
> > > complete.
> > >
> > >
> > > On Mon, May 13, 2013 at 5:16 PM, Lorin Beer <lorin.beer.dev@gmail.com
> > > >wrote:
> > >
> > > > before the merge future/master merge happens, I'm pulling in all the
> > > > redirected pull requests
> > > > https://github.com/apache/cordova-blackberry/pulls
> > > >
> > > > and tracking the progress here:
> > > > https://issues.apache.org/jira/browse/CB-3382#comment-13656385
> > > >
> > >
> >
>

Re: blackberry10 merge begun

[Bryan Higgins <bh...@blackberry.com>]

thanks, cordova-blackberry looks good, but the docs changes didn't get
merged in cleanly. I see merge artifacts in getting started and plugin
development.


On Mon, May 13, 2013 at 5:30 PM, Lorin Beer <lo...@gmail.com>wrote:

> yes, I believe I have resolved all the ones that were marked as ready to
> pull in. I'm stepping out of the office, but when I'm back I'll do the
> merge into master.
>
>
>
> On Mon, May 13, 2013 at 2:20 PM, Bryan Higgins <bryan@bryanhiggins.net
> >wrote:
>
> > Thanks Lorin!
> >
> > A few of those are still "in progress" as they have unresolved feedback
> or
> > are untested.
> >
> > I will get them closed and re-opened against master once the merge is
> > complete.
> >
> >
> > On Mon, May 13, 2013 at 5:16 PM, Lorin Beer <lorin.beer.dev@gmail.com
> > >wrote:
> >
> > > before the merge future/master merge happens, I'm pulling in all the
> > > redirected pull requests
> > > https://github.com/apache/cordova-blackberry/pulls
> > >
> > > and tracking the progress here:
> > > https://issues.apache.org/jira/browse/CB-3382#comment-13656385
> > >
> >
>

Re: blackberry10 merge begun

[Lorin Beer <lo...@gmail.com>]

yes, I believe I have resolved all the ones that were marked as ready to
pull in. I'm stepping out of the office, but when I'm back I'll do the
merge into master.



On Mon, May 13, 2013 at 2:20 PM, Bryan Higgins <br...@bryanhiggins.net>wrote:

> Thanks Lorin!
>
> A few of those are still "in progress" as they have unresolved feedback or
> are untested.
>
> I will get them closed and re-opened against master once the merge is
> complete.
>
>
> On Mon, May 13, 2013 at 5:16 PM, Lorin Beer <lorin.beer.dev@gmail.com
> >wrote:
>
> > before the merge future/master merge happens, I'm pulling in all the
> > redirected pull requests
> > https://github.com/apache/cordova-blackberry/pulls
> >
> > and tracking the progress here:
> > https://issues.apache.org/jira/browse/CB-3382#comment-13656385
> >
>

Re: blackberry10 merge begun

[Bryan Higgins <br...@bryanhiggins.net>]

Thanks Lorin!

A few of those are still "in progress" as they have unresolved feedback or
are untested.

I will get them closed and re-opened against master once the merge is
complete.


On Mon, May 13, 2013 at 5:16 PM, Lorin Beer <lo...@gmail.com>wrote:

> before the merge future/master merge happens, I'm pulling in all the
> redirected pull requests
> https://github.com/apache/cordova-blackberry/pulls
>
> and tracking the progress here:
> https://issues.apache.org/jira/browse/CB-3382#comment-13656385
>