git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Submodule not updated automatically on merge conflict

From
Heiko Voigt <hvoigt@hvoigt.net>
Date
Dec 17, 2012, 20:41 UTC
Message-ID
<20121217204148.GA23267@book.hvoigt.net>
In-Reply-To
<CAHtLG6S28bhkAuypy-YgYY9wOWTH+Mp9g-CWmM_aDf7=dpKXZw@mail.gmail.com>
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
Previous: 乙酸鋰
Message 2 of 2 in “Submodule not updated automatically on merge conflict”
  1. 乙酸鋰Dec 13, 2012
  2. Heiko VoigtDec 17, 2012

Read the whole thread, see it on lore, or plain text.

$ 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.