On 11/08/2015 06:03 AM, Michael Haggerty wrote: > [...] > I can see a few ways that we could make our series even more > straightforward: > > 1. Leave refs.c in its original location (as suggested by Junio). > Optionally, it could be moved at a later date when this area is > quiescent. > [...] I just tried this (it was less work than expected). It doesn't make the merge conflict with lf/ref-is-hidden-namespace go away because the functions in the new refs.c are ordered differently than in the old refs.c. But it does turn it into a simple rerere-able conflict. I'll check how much work it would be to make the order of functions in the new refs.c match that in the old one... Michael -- Michael Haggerty mhagger@xxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html