# How to handle confilicts when merging submodules in the process of rebase

1 messages from 2008-01-13 to 2008-01-13. Participants: Ping Yin.
Thread: https://gitlist.dev/t/11603

## Ping Yin, 2008-01-13 06:54

Subject: How to handle confilicts when merging submodules in the process of rebase
Message-ID: <46dff0320801122254u85dde52ra68ffc3abbf62bda@mail.gmail.com>
URL: https://gitlist.dev/e/46dff0320801122254u85dde52ra68ffc3abbf62bda%40mail.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

```