On Sat, Feb 20, 2010 at 2:05 PM, Avery Pennarun <apenwarr@xxxxxxxxx> wrote: > On Fri, Feb 19, 2010 at 9:25 PM, Jon Seymour <jon.seymour@xxxxxxxxx> wrote: >> (A hammer is, of course, a reasonably good tool for making things flat >> although it does tend to break things along the way). > > Nice analogy. Well, thanks for the clarification and best of luck in > your slightly crazy project :) > Thank you - FWIW, it is shaping up very well. In turns out that in cases where the original merge was resolved in favour of the conflict, the compensation can be squashed with the compensated commit - effectively bring the eventual resolution forward in time. This is so, so cool. jon. -- 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