* How to handle confilicts when merging submodules in the process of rebase
@ 2008-01-13 6:54 Ping Yin
0 siblings, 0 replies; only message in thread
From: Ping Yin @ 2008-01-13 6:54 UTC (permalink / raw)
To: Git Mailing List
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-13 6:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-13 6:54 How to handle confilicts when merging submodules in the process of rebase Ping Yin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).