Yann Dirson wrote: > What was particular about this tree, is that we are several people > working on it, namely developpers taking care of the app, and me as > build manager taking care of the build mechanics as well as kernel+OS. > So the task was logically divided: one dev would merge the app, and I > would merge everything else. As you see, it's far from one-file > merges, but the problem is quite similar. This I think would be best handled by (future/prototype) submodules support. I wonder if fake-recording resolutions in git-rerere would help in that case... -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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