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
