Branch Status? branch_4x vs master

[Paul Irwin <pi...@feature23.com>]

Hello all,

I have some available R&D time so I'd like to jump back in. I'm a little
confused about the status of branch_4x vs master, it looks like they've
diverged significantly:

"This branch is 462 commits ahead, 131 commits behind master"

Can someone fill me in on what's going on here? It looks like I should jump
in to master, but it appears to not match the commit history of branch_4x
work that happened a while back.

Thanks!

Paul Irwin
Lead Software Engineer
feature[23]

Email: pirwin@feature23.com
Cell: 863-698-9294

Re: Branch Status? branch_4x vs master

[Wyatt Barnett <wy...@gmail.com>]

I think one should be working off the new master branch -- or at least that
is where the CI efforts are going, see https://github.com/apache/lucene.net

On Tue, Nov 25, 2014 at 10:06 AM, Paul Irwin <pi...@feature23.com> wrote:

> Hello all,
>
> I have some available R&D time so I'd like to jump back in. I'm a little
> confused about the status of branch_4x vs master, it looks like they've
> diverged significantly:
>
> "This branch is 462 commits ahead, 131 commits behind master"
>
> Can someone fill me in on what's going on here? It looks like I should jump
> in to master, but it appears to not match the commit history of branch_4x
> work that happened a while back.
>
> Thanks!
>
> Paul Irwin
> Lead Software Engineer
> feature[23]
>
> Email: pirwin@feature23.com
> Cell: 863-698-9294
>