So it sounds like these PRs do move us closer to bringing the two branches together. But I think I am missing your high-level approach though.
How are we going to get all of the functionality from the feature branch into master? Are you going to bite-off small chunks of the feature branch and introduce PRs against master? On Wed, Sep 20, 2017 at 9:23 AM Otto Fowler <[email protected]> wrote: > Right now, these two PR’s are stacked, the UI depends on the BundleSystem > changes. > I would rather bring them down to feature before I do master integration, > than integrate master > into feature and then bring it out to the stacked PR’s. Simple as that. > > > > On September 20, 2017 at 08:35:09, Nick Allen ([email protected]) wrote: > > Hi Otto - > > What is the plan for bringing the feature branch and master together? Do > these PRs move us closer to bringing the two branches together? > > Thanks > > > > On Wed, Sep 20, 2017 at 8:19 AM Otto Fowler <[email protected]> > wrote: > > > Can I get a bump on https://github.com/apache/metron/pull/747 and > > https://github.com/apache/metron/pull/761? > > > > The next time I take master is going to be a bit of integration work, > and I > > would like to unstack and get my stuff integrated first. > > > >
