In such a case, the blob sha1 for the conflicting submodule in working tree and 3 stages of index may be different from each other. So git add will not work if I want to use stage 1 or stage 2 as the merging result. Then how? -- Ping Yin - 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
