# git submodule vs git mergetool

2 messages from 2011-01-18 to 2011-01-19. Participants: Mathieu Malaterre, Jens Lehmann.
Thread: https://gitlist.dev/t/26298

## Mathieu Malaterre, 2011-01-18 09:04

Subject: git submodule vs git mergetool
Message-ID: <AANLkTi=jS1LQY0kfSD_=o0PZ9BAF7k=06QFT+agkvGNa@mail.gmail.com>
URL: https://gitlist.dev/e/AANLkTi%3DjS1LQY0kfSD_%3Do0PZ9BAF7k%3D06QFT%2BagkvGNa%40mail.gmail.com

```
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, 2011-01-19 18:40

Subject: Re: git submodule vs git mergetool
Message-ID: <4D373037.8050606@web.de>
URL: https://gitlist.dev/e/4D373037.8050606%40web.de
In-Reply-To: <AANLkTi=jS1LQY0kfSD_=o0PZ9BAF7k=06QFT+agkvGNa@mail.gmail.com>

```
Am 18.01.2011 10:04, schrieb Mathieu Malaterre:
> $ 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 ...

```