Re: Towards 0.13 (Apache release)

2018-08-30 Thread Jihoon Son
It works for me. Thanks Gian. Best, Jihoon On Thu, Aug 30, 2018 at 11:36 AM Charles Allen wrote: > I just merged to one of the PRs I'm working on, and after upping the rename > limit to pretty high it was relatively painless > > On Thu, Aug 30, 2018 at 10:24 AM Slim Bouguerra > wrote: > > >

Re: Towards 0.13 (Apache release)

2018-08-30 Thread Charles Allen
I just merged to one of the PRs I'm working on, and after upping the rename limit to pretty high it was relatively painless On Thu, Aug 30, 2018 at 10:24 AM Slim Bouguerra wrote: > Thanks Gian worked for me! > > > On Aug 30, 2018, at 10:06 AM, Gian Merlino wrote: > > > > That PR is merged now!

Re: Towards 0.13 (Apache release)

2018-08-30 Thread Slim Bouguerra
Thanks Gian worked for me! > On Aug 30, 2018, at 10:06 AM, Gian Merlino wrote: > > 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

Re: Towards 0.13 (Apache release)

2018-08-30 Thread Gian Merlino
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