From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Mon, 10 Aug 2009 10:01:48 GMT
Subject: Re: .gitignore vs untracked working file
Message-ID: <20090810100148.GB22200@pengutronix.de>
In-Reply-To: <286817520908100257n35b178ebu387161658554b4a@mail.gmail.com>

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/

?

Best regards
Uwe

-- 
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |