Hi, On Thu, 30 Nov 2006, Nicholas Allen wrote: > Does this mean if I have, for example, a large C++ file with a bunch of > methods in it and I move one of the methods from the bottom of the file > to the top and in another branch someone makes a change to that method > that when I merge their changes git will merge their changes into the > method at the top of the file where I have moved it? As for now, no, it does not. This is a shortcoming of RCS merge which does the heavy-lifting. Having said that, stay tuned for new developments: the functionality of merge is being integrated in git. This opens the door to make use of the code tracking support in git, to do exactly what you just proposed. Ciao, Dscho - 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