{"thread":{"id":"32328","subject":"Submodule not updated automatically on merge conflict","startedAt":"2012-12-13T05:46:43Z","lastAt":"2012-12-17T20:41:49Z","messageCount":2,"participants":["乙酸鋰","Heiko Voigt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"204822","messageId":"CAHtLG6S28bhkAuypy-YgYY9wOWTH+Mp9g-CWmM_aDf7=dpKXZw@mail.gmail.com","threadId":"32328","inReplyTo":null,"subject":"Submodule not updated automatically on merge conflict","fromName":"乙酸鋰","fromEmail":"ch3cooli@gmail.com","sentAt":"2012-12-13T05:46:43Z","receivedAt":"2012-12-13T05:46:43Z","isPatch":false,"sender":{"key":"ch3cooli@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2804967?v=4"},"body":"Hi,\n\nIf there are merge conflict files, then changed submodules are not\nupdated automatically.\nWhy not submodules?\nFiles do try to merge / update.\n\nRegards,\nch3cooli\n"},{"id":"205073","messageId":"20121217204148.GA23267@book.hvoigt.net","threadId":"32328","inReplyTo":"CAHtLG6S28bhkAuypy-YgYY9wOWTH+Mp9g-CWmM_aDf7=dpKXZw@mail.gmail.com","subject":"Re: Submodule not updated automatically on merge conflict","fromName":"Heiko Voigt","fromEmail":"hvoigt@hvoigt.net","sentAt":"2012-12-17T20:41:49Z","receivedAt":"2012-12-17T20:41:49Z","isPatch":false,"sender":{"key":"hvoigt@hvoigt.net","avatar":"https://avatars.githubusercontent.com/u/184958?v=4"},"body":"Hi,\n\nOn Thu, Dec 13, 2012 at 01:46:43PM +0800, ?A???Y wrote:\n> If there are merge conflict files, then changed submodules are not\n> updated automatically.\n> Why not submodules?\n> Files do try to merge / update.\n\nThis is work in progress, currently you still have to use submodule\nupdate to get them in sync with the tracked sha1. BTW, I would not expect\nmerge to update any submodules but let them stay at the tip of the\nbranch you are merging in. Or which side would you expect to get checked\nout?\n\nCheers Heiko\n"}]}