From: 乙酸鋰 <ch3cooli@gmail.com>
Date: Thu, 13 Dec 2012 05:46:43 GMT
Subject: Submodule not updated automatically on merge conflict
Message-ID: <CAHtLG6S28bhkAuypy-YgYY9wOWTH+Mp9g-CWmM_aDf7=dpKXZw@mail.gmail.com>

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