threads / discuss / 26298

git submodule vs git mergetool

Subject: git submodule vs git mergetool

## tl;dr

2 messages between Jan 18, 2011 and Jan 19, 2011.

replies: 1people: 2as markdown or json

Mathieu Malaterre· Jan 18, 2011, 09:04 UTC · lore

Hi there,

  not sure if this is the right place to report a problem. anyway I
have two branches (release and master) each one has a Testing/Data
submodule:

git submodule add git://gdcm.git.sourceforge.net/gitroot/gdcm/gdcmData Testing/Data

  During a merge those two submodules produced a conflict:

$ git mergetool merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff Merging the files: Testing/Data

mv: cannot stat `Testing/Data': No such file or directory
cp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory
error: git checkout-index: cannot create temporary subproject
error: git checkout-index: cannot create temporary subproject
Normal merge conflict for 'Testing/Data':
  {local}: created
  {remote}: created
Hit return to start merge resolution tool (gvimdiff):
3 files to edit
Testing/Data seems unchanged.
Was the merge successful? [y/n] y
fatal: unable to stat 'Testing/Data': No such file or directory

I guess this is a minor issue, but I thought I should report it here.

Thanks for this tool !

-- 
Mathieu

Jens Lehmann· Jan 19, 2011, 18:40 UTC · re: Mathieu Malaterre · lore

Re: git submodule vs git mergetool

Am 18.01.2011 10:04, schrieb Mathieu Malaterre:

Show 19 quoted lines

> $ git mergetool
> merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff
> tortoisemerge gvimdiff diffuse ecmerge p4merge araxis emerge vimdiff
> Merging the files: Testing/Data
> 
> mv: cannot stat `Testing/Data': No such file or directory
> cp: cannot stat `./Testing/Data.BACKUP.5251': No such file or directory
> error: git checkout-index: cannot create temporary subproject
> error: git checkout-index: cannot create temporary subproject
> Normal merge conflict for 'Testing/Data':
>   {local}: created
>   {remote}: created
> Hit return to start merge resolution tool (gvimdiff):
> 3 files to edit
> Testing/Data seems unchanged.
> Was the merge successful? [y/n] y
> fatal: unable to stat 'Testing/Data': No such file or directory
> 
> I guess this is a minor issue, but I thought I should report it here.

I assume this happens when you do the merge in a work tree where this submodule does not exist? Right now git does not populate submodules that show up while switching branches or doing a merge. I am working on that feature, but progress is not as swift as I hoped ...