threads / discuss / 32328

Submodule not updated automatically on merge conflict

Subject: Submodule not updated automatically on merge conflict

## tl;dr

2 messages between Dec 13, 2012 and Dec 17, 2012.

replies: 1people: 2as markdown or json

乙酸鋰· Dec 13, 2012, 05:46 UTC · lore
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

Heiko Voigt· Dec 17, 2012, 20:41 UTC · re: 乙酸鋰 · lore

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

← back to recent threads