That PR is merged now! If anyone here still has outstanding PRs that are now in conflict with master, try running this before merging master, it really helps git out.
git config --local merge.renameLimit 5000 My experience was that even a patch with a few dozen changed files merged pretty cleanly, after setting this config. I just had a few conflicts to resolve in imports. On Wed, Aug 29, 2018 at 4:09 PM Gian Merlino <g...@apache.org> wrote: > I just raised https://github.com/apache/incubator-druid/pull/6266. I > think for sanity's sake, I would really appreciate it if we got this one > merged before merging any other PRs. (It will conflict with 100% of other > PRs) > > On Wed, Aug 29, 2018 at 9:34 AM Gian Merlino <g...@apache.org> wrote: > >> Hi everyone, >> >> As we continue towards 0.13 I started looking into the "great renaming" >> (of all packages from io.druid -> org.apache.druid) and am getting a PR >> ready. I know Slim is working on >> https://github.com/apache/incubator-druid/pull/6215 too (automated >> license checking and some header fixups). >> >> Other than these Apache related items, we have 26 open issues/PRs in the >> 0.13.0 milestone: https://github.com/apache/incubator-druid/milestone/25. >> Is this everything we want to include? Is anything there we should bump to >> the next release? Is anything _not_ there that needs to be added? >> >> Let's figure out when we can target a code freeze -- the start of the RC >> train for our first Apache release!! >> >
