Hi guys - unsure if it's helpful at your end but I rebased (almost) all of the open PR's as of this morning on the current HEAD of master (5435ec4), removed any of the wrong way merges, cleaned up the conflicts and pushed them to my fork. They're all available here: https://github.com/tomj/swift-corelibs-foundation/branches/all - I avoided 1 or 2 as they were heavy on the conflicts and I thought I'd their authors would have a better idea on resolving those issues.
Let me know if there's anything I can do to help get these into the mainline to make it easier for you all. Cheers, Tom > Message: 18 > Date: Fri, 18 Dec 2015 08:21:44 -0800 > From: Mike Ferris <mfer...@apple.com> > To: Philippe Hausler <phaus...@apple.com> > Cc: Swift Core Libs <swift-corelibs-dev@swift.org> > Subject: Re: [swift-corelibs-dev] Upcoming holiday schedule > Message-ID: <ad8f0e5c-2555-4c15-a7fa-7c852ad2e...@apple.com> > Content-Type: text/plain; charset="utf-8" > I will also be out starting tomorrow through the end of the month which > means XCTest will get little coverage during that time. > Mike > > On Dec 17, 2015, at 9:18 AM, Philippe Hausler via swift-corelibs-dev < > swift-corelibs-dev@swift.org> wrote: > > > > I will probably be around a bit more than Tony over the break; I will > try to keep up with the pull requests. > > > > There are a few things that I think will speed up the process so that we > can keep things running well: > > > > Discrete commits that implement a specific thing; reviewing two > different spots sometimes is a bit hard to follow it all. > > Review feedback from the community helps a ton > > Rebasing commits from master so that there are no merge conflicts makes > my job easier. > > Unit tests are awesome! > > > > These are rules of thumb that actually can apply easily beyond the break. > > > >> On Dec 17, 2015, at 9:11 AM, Tony Parker via swift-corelibs-dev < > swift-corelibs-dev@swift.org <mailto:swift-corelibs-dev@swift.org>> wrote: > >> > >> Indeed! I hope the mismatch doesn’t cause us to fall too far behind. ;) > >> > >> - Tony > >> > >>> On Dec 17, 2015, at 9:10 AM, Brian Gesiak <modoca...@gmail.com > <mailto:modoca...@gmail.com>> wrote: > >>> > >>> Thanks for the head's up! Conversely, I imagine that for many people, > holidays from work are precisely the time to contribute! :) > >>> > >>> - Brian Gesiak > >>> > >>> > >>> > >>> > >>> > >>> On Thu, Dec 17, 2015 at 9:03 AM -0800, "Tony Parker via > swift-corelibs-dev" <swift-corelibs-dev@swift.org <mailto: > swift-corelibs-dev@swift.org>> wrote: > >>> > >>> Hello fellow contributors, > >>> > >>> As you are aware, we are fast approaching the year-end holiday season. > Here at Apple, many of us are taking some time off starting next week > through the new year. As a result, it is likely that some pull requests > will take more time than expected to review and merge. Even if some of us > are on vacation, this is a great opportunity for anyone to jump in and help > review PRs! > >>> > >>> Thanks and happy new year, > >>> - Tony > >>> > >>> > >>> _______________________________________________ > >>> swift-corelibs-dev mailing list
_______________________________________________ swift-corelibs-dev mailing list swift-corelibs-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-corelibs-dev
