2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: 乙酸鋰 <hidden>
Date: 2016-06-15 22:55:31
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
From: Heiko Voigt <hidden>
Date: 2016-06-15 22:55:32
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 in sync with the tracked sha1. BTW, I would not expect merge to update any submodules but let them stay at the tip of the branch you are merging in. Or which side would you expect to get checked out? Cheers Heiko