Submodule not updated automatically on merge conflict

From: 乙酸鋰 <ch3cooli@gmail.com>
Date: Dec 13, 2012, 05:46 UTC
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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.