Re: Submodule not updated automatically on merge conflict

Hi, On Thu, Dec 13, 2012 at 01:46:43PM +0800, ?A???Y wrote: > If there are merge conflict files, then changed submodules are not > updated automatically. > Why not submodules? > Files do try to merge / update. This is work in progress, currently you still have to use submodule update to get them

Submodule not updated automatically on merge conflict

Hi, If there are merge conflict files, then changed submodules are not updated automatically. Why not submodules? Files do try to merge / update. Regards, ch3cooli -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordom