From: Ping Yin Date: Thu, 01 May 2008 04:56:31 GMT Subject: Re: Making submodules easier to work with (auto-update on checkout or merge, stash & restore submodules) Message-ID: <46dff0320804302156w7ed0e139pae171fa51a9e8cb8@mail.gmail.com> In-Reply-To: On Thu, May 1, 2008 at 4:19 AM, Tim Harper wrote: > > I could see an issue if you changed the submodule version, and forgot to > commit the version change in your super project, and then switched branches, > and lost your version change. Perhaps the correct behavior in this case > would be to only automatically update the submodule version if it didn't > differ from the superproject version in the "from" branch. > Agree. Doing this will make submodule be more consistent with the ordinary file. Further, when switching to another branch with diffrent recorded commit about the submodule and the submodule in the from branch has been modified, just refuse to switch because this can be considered a conflict and there is no easy way to merge. -- Ping Yin