From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
Date: Mon, 10 Aug 2009 10:17:02 GMT
Subject: Re: .gitignore vs untracked working file
Message-ID: <286817520908100317k4e98faf9n4e852b7abd4719fe@mail.gmail.com>
In-Reply-To: <20090810100148.GB22200@pengutronix.de>

2009/8/10 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
> Hello,
>
>> $ git checkout master
>> error: Untracked working tree file 'Project/bin/path/file.jjt' would
>> be overwritten by merge.
> What is the output of
>
>        $ git ls-files master bin/

Nothing:

$ git ls-files master bin/
$ git ls-files master Project/bin/
$ git ls-files mybranch bin/
$ git ls-files mybranch Project/bin/

$ ll 'Project/bin/path/file.jjt'
-rw-r--r--    1 bost  Administ     8233 May 10  2006 Project/bin/path/file.jjt
$ git ls-files ''Project/bin/path/file.jjt'

BTW the rule to ignore bin/ is exclusively in the .gitignore on the
branch mybranch not in the master branch. Might this be the problem?

Bost