Junio C Hamano <gitster@xxxxxxxxx> writes: > Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: > >> Um, well, my patch series includes the same changes that Julian's wants >> to introduce, but following lots of other changes, cleanups, >> documentation improvements, etc. Moreover, my patch series builds on >> mh/iterate-refs, with which Julian's patch conflicts. In other words, >> it would be a real mess to reroll my series on top of Julian's patch. > > Conflicts during re-rolling was not something I was worried too much > about---that is just the fact of life. We cannot easily resolve two topics > that want to go in totally different direction, but we should be able to > converge two topics that want to take the same approach in the end, > especially one is a subset of the other. Ah, also I should have noted that I have a fix-up between mh/iterate-refs and Julian's patch already queued on 'pu'. I am planning to make mh/iterate-refs graduate to 'master' soonish, so hopefully things will become simpler. Thanks. -- 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