cool, thx zhitao! On Sat, Feb 4, 2017 at 6:32 AM, Jie Yu <yujie....@gmail.com> wrote:
> very cool! I used to do that manually. > > - Jie > > On Fri, Feb 3, 2017 at 2:10 PM, Michael Park <mp...@apache.org> wrote: > > > Thanks Zhitao for pushing this! This is awesome. > > > > Note that we made the flag opt-in so that you know to pay more attention > > when using this flag. > > Albeit rarely, it might not merge to what you want exactly. > > > > MPark > > > > On Fri, Feb 3, 2017 at 2:05 PM, Zhitao Li <zhitaoli...@gmail.com> wrote: > > > > > Hi all, > > > > > > Just a quick FYI that you can use a new "--3way" or "-3" option in > > > support/apply-reviews.py to perform a 3 way merge for patches which > don't > > > apply cleanly (see git-apply > > > <https://git-scm.com/docs/git-apply#git-apply---3way> manual for > > details). > > > > > > Special thanks to Michael Park to shepherd and committed the patch > > > <https://reviews.apache.org/r/55732/>. > > > > > > Enjoy! > > > > > > -- > > > Cheers, > > > > > > Zhitao Li > > > > > > -- Best Regards, Haosdent Huang
