Hi Ben, Thanks for your persistence. On Wed, May 2, 2018 at 9:01 AM, Ben Peart <Ben.Peart@xxxxxxxxxxxxx> wrote: > This version incorporates Elijah's fixup patch and is now based on > en/rename-directory-detection in next. en/rename-directory-detection was in master but reverted. en/rename-directory-detection-reboot is the new series, and isn't quite in next yet; Junio just said in the last "What's cooking" that he intends to merge it down. However, the two series are obviously similar, so your rebasing even onto the old one does cut down on the conflicts considerably. Rebasing this latest series onto en/rename-directory-detection-reboot leaves just one minor conflict. Anyway, I've looked over this latest re-roll and it looks good to me: Reviewed-by: Elijah Newren <newren@xxxxxxxxx>
