threads / discuss / 11603

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

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

## tl;dr

One message between Jan 13, 2008 and Jan 13, 2008.

replies: 0people: 1as markdown or json

Ping Yin· Jan 13, 2008, 06:54 UTC · lore

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