* Submodule not updated automatically on merge conflict
@ 2012-12-13 5:46 乙酸鋰
2012-12-17 20:41 ` Heiko Voigt
0 siblings, 1 reply; 2+ messages in thread
From: 乙酸鋰 @ 2012-12-13 5:46 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Submodule not updated automatically on merge conflict
2012-12-13 5:46 Submodule not updated automatically on merge conflict 乙酸鋰
@ 2012-12-17 20:41 ` Heiko Voigt
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Voigt @ 2012-12-17 20:41 UTC (permalink / raw)
To: ?A???Y; +Cc: git, Jens Lehmann
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-17 20:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-13 5:46 Submodule not updated automatically on merge conflict 乙酸鋰
2012-12-17 20:41 ` Heiko Voigt
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).