{"thread":{"id":"26395","subject":"Also seeing the \"problem with cherry-picking a commit which comes before introducing a new submodule\"","startedAt":"2011-02-03T04:08:37Z","lastAt":"2011-02-03T04:08:37Z","messageCount":1,"participants":["Joshua Jensen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"160305","messageId":"4D4A2A45.3060804@workspacewhiz.com","threadId":"26395","inReplyTo":null,"subject":"Also seeing the \"problem with cherry-picking a commit which comes before introducing a new submodule\"","fromName":"Joshua Jensen","fromEmail":"jjensen@workspacewhiz.com","sentAt":"2011-02-03T04:08:37Z","receivedAt":"2011-02-03T04:08:37Z","isPatch":false,"sender":{"key":"jjensen@workspacewhiz.com","avatar":"https://avatars.githubusercontent.com/u/111687?v=4"},"body":"Described in this thread, http://lists.zerezo.com/git/msg737184.html, \nand this thread, http://lists.zerezo.com/git/msg705275.html, is a \nproblem similar to what I've been seeing today.  It seems I can resolve \nthe \"conflicting\" submodule(s) and continue on, but it is a bit painful \nas there are a small number of them.  I also tried an interactive rebase \nand assigning a 'pick' entry with the commit I'd like to cherry-pick, \nand the same problem manifests.\n\nIn any case, it seems Jonathan Nieder has potentially identified the \nproblem at http://lists.zerezo.com/git/msg737401.html.\n\nHas a patch come through that addresses this?  If one did, did it make \nit into 1.7.4?\n\nThanks!\n\nJosh\n"}]}