Elijah Newren <new...@gmail.com> writes: > On Thu, Apr 19, 2018 at 10:57 AM, Elijah Newren <new...@gmail.com> wrote: >> This series is a reboot of the directory rename detection series that was >> merged to master and then reverted due to the final patch having a buggy >> can-skip-update check, as noted at >> https://public-inbox.org/git/xmqqmuya43cs....@gitster-ct.c.googlers.com/ >> This series based on top of master. > > ...and merges cleanly to next but apparently has some minor conflicts > with both ds/lazy-load-trees and ps/test-chmtime-get from pu. > > What's the preferred way to resolve this? Rebase and resubmit my > series on pu, or something else?
The series as-is is fine, I think, from the maintainer's point of view. Thanks.
