{"thread":{"id":"26298","subject":"git submodule vs git mergetool","startedAt":"2011-01-18T09:04:01Z","lastAt":"2011-01-19T18:40:55Z","messageCount":2,"participants":["Mathieu Malaterre","Jens Lehmann"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"159577","messageId":"AANLkTi=jS1LQY0kfSD_=o0PZ9BAF7k=06QFT+agkvGNa@mail.gmail.com","threadId":"26298","inReplyTo":null,"subject":"git submodule vs git mergetool","fromName":"Mathieu Malaterre","fromEmail":"mathieu.malaterre@gmail.com","sentAt":"2011-01-18T09:04:01Z","receivedAt":"2011-01-18T09:04:01Z","isPatch":false,"sender":{"key":"mathieu.malaterre@gmail.com","avatar":"https://gravatar.com/avatar/0728db14da3b5f9cb00476f504394196a14dac116214d8114f402fad0871bb86?d=mp&s=160"},"body":"Hi there,\n\n  not sure if this is the right place to report a problem. anyway I\nhave two branches (release and master) each one has a Testing/Data\nsubmodule:\n\ngit submodule add git://gdcm.git.sourceforge.net/gitroot/gdcm/gdcmData\nTesting/Data\n\n  During a merge those two submodules produced a conflict:\n\n\n$ git mergetool\nmerge tool candidates: meld opendiff kdiff3 tkdiff xxdiff\ntortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff\nMerging the files: Testing/Data\n\nmv: cannot stat `Testing/Data': No such file or directory\ncp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory\nerror: git checkout-index: cannot create temporary subproject\nerror: git checkout-index: cannot create temporary subproject\nNormal merge conflict for 'Testing/Data':\n  {local}: created\n  {remote}: created\nHit return to start merge resolution tool (gvimdiff):\n3 files to edit\nTesting/Data seems unchanged.\nWas the merge successful? [y/n] y\nfatal: unable to stat 'Testing/Data': No such file or directory\n\nI guess this is a minor issue, but I thought I should report it here.\n\nThanks for this tool !\n-- \nMathieu\n"},{"id":"159652","messageId":"4D373037.8050606@web.de","threadId":"26298","inReplyTo":"AANLkTi=jS1LQY0kfSD_=o0PZ9BAF7k=06QFT+agkvGNa@mail.gmail.com","subject":"Re: git submodule vs git mergetool","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2011-01-19T18:40:55Z","receivedAt":"2011-01-19T18:40:55Z","isPatch":false,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 18.01.2011 10:04, schrieb Mathieu Malaterre:\n> $ git mergetool\n> merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff\n> tortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff\n> Merging the files: Testing/Data\n> \n> mv: cannot stat `Testing/Data': No such file or directory\n> cp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory\n> error: git checkout-index: cannot create temporary subproject\n> error: git checkout-index: cannot create temporary subproject\n> Normal merge conflict for 'Testing/Data':\n>   {local}: created\n>   {remote}: created\n> Hit return to start merge resolution tool (gvimdiff):\n> 3 files to edit\n> Testing/Data seems unchanged.\n> Was the merge successful? [y/n] y\n> fatal: unable to stat 'Testing/Data': No such file or directory\n> \n> I guess this is a minor issue, but I thought I should report it here.\n\nI assume this happens when you do the merge in a work tree where this\nsubmodule does not exist? Right now git does not populate submodules\nthat show up while switching branches or doing a merge. I am working\non that feature, but progress is not as swift as I hoped ...\n"}]}