On Mon, 5 May 2008, Steven Grimm wrote: > > Doesn't seem *fundamentally* impossible to produce the results that are most > likely to be what people want. You didn't understand what was fundamentally impossible. And btw, this has nothing to do with directory renames either. There are tons of these kinds of merge issues that bad SCM developes have been masturbating over for YEARS. There's a whole science of making idiotic new merging models, one fancier than the other. The fact is, you cannot do a perfect job, the best thing you can do is pick a simple model, and try to make it repeatable and easy to fix up. Maybe somebody bothers to implement some directory rename heuristic some day. Quite frankly, I personally cannot care less. It really is mental masturbation, and has absolutely no relevance for any real-world problem. Linus -- 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