On 6/15/07, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
But yeah, if you can check in stage 1 (_without_ changing the working tree) whether the merge will work, then everything is fine.
Aha- so at phase 1 we know - what paths are dirty in the checkout - what paths of the merge need an actuall diff3 merge perhaps we can do those diff3 merges elsewhere (tempfiles). If they are trivial diff3 merges, then we can complete the merge operation without touching the checkout. After this is complete, we can then update the checkout... cheers, m - 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
