From: Ping Yin Date: Sun, 13 Jan 2008 06:54:29 GMT Subject: How to handle confilicts when merging submodules in the process of rebase Message-ID: <46dff0320801122254u85dde52ra68ffc3abbf62bda@mail.gmail.com> 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