views:

49

answers:

1

Hi,

I'm developing an application that is supposed to run on both Android as well as regular Java SE.

I have an eclipse project called foobar-core which contains code that is used both by the Android and the SE version. I have another project called foobar-android, which contains all android-specific code.

I need to reference some of the foobar-core code in the foobar-android project, so I added foobar-core to foobar-android in Settings -> Java Build path -> Projects -> Required projects on the build path. This works fine, as I can use code from foobare-core in foobar-android now.

Here's the problem: Both foobar-core and foobar-android are independent git repositories, which means they both have a .git subdirectory. Now I get a lot of warnings on the "Console" tab whenever I compile foobar-android. They look like this:

/foobar-core/src/.git/HEAD conflicts with another file already put at .git/HEAD
/foobar-core/src/.git/config conflicts with another file already put at .git/config
/foobar-core/src/.git/description conflicts with another file already put at > .git/description
/foobar-core/src/.git/hooks/applypatch-msg.sample conflicts with another file already > put at .git/hooks/applypatch-msg.sample

How can I tell Eclipse to ignore the .git files when importing sources from the foobar-core project?

+2  A: 

I would setup a .gitignore file that simply ignored the entire foobar-code project.

Josh K
Maybe my problem explanation wasn't good enough: The error doesn't occur when committing to git, but when I *compile* the project in Eclipse. This is what I get: http://i.imgur.com/PuCbH.png
rodion
@rodion: That's interesting, I would still try the gitignore file though.
Josh K