On Mon, 2015-11-09 at 18:03 +0100, Michael Haggerty wrote: > This is another reroll of the pre-vtable part of the refs-backend > patch series dt/refs-backend-pre-vtable. v6 [1] proved cumbersome > because it conflicted messily with lf/ref-is-hidden-namespace [2]. The > conflicts were partly due to the motion of code across files but, even > worse, due to the change of order of function definitions between old > and new files. > > So I have heavily "optimized" this reroll for reviewability and to > minimize conflicts with other work in the area. The only such work > that I know of is lf/ref-is-hidden-namespace, which can now be merged > with this series *without conflicts*.
Modulo Ramsey's comments, this works for me. AIUI, Ronnie's original patchset was written the way it was to avoid merge conflicts. Because of the changes in the interim, it turns out not to quite work that way. So it's totally OK with me to write it this new way. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
