{"thread":{"id":"11603","subject":"How to handle confilicts when merging submodules in the process of rebase","startedAt":"2008-01-13T06:54:29Z","lastAt":"2008-01-13T06:54:29Z","messageCount":1,"participants":["Ping Yin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"65231","messageId":"46dff0320801122254u85dde52ra68ffc3abbf62bda@mail.gmail.com","threadId":"11603","inReplyTo":null,"subject":"How to handle confilicts when merging submodules in the process of rebase","fromName":"Ping Yin","fromEmail":"pkufranky@gmail.com","sentAt":"2008-01-13T06:54:29Z","receivedAt":"2008-01-13T06:54:29Z","isPatch":false,"sender":{"key":"pkufranky@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5346?v=4"},"body":"In such a case, the blob sha1 for the conflicting submodule in working\ntree and 3 stages of index may be different from each other.\nSo git add will not work if I want to use stage 1 or stage 2 as the\nmerging result. Then how?\n\n-- \nPing Yin\n"}]}