git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: .gitignore vs untracked working file

From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date
Aug 10, 2009, 10:01 UTC
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/  |
Previous: Rostislav SvobodaNext: Rostislav Svoboda
Message 2 of 7 in “.gitignore vs untracked working file”
  1. Rostislav SvobodaAug 10, 2009
  2. Uwe Kleine-KönigAug 10, 2009
  3. Rostislav SvobodaAug 10, 2009
  4. Johannes SixtAug 10, 2009
  5. Rostislav SvobodaAug 10, 2009
  6. Johannes SixtAug 10, 2009
  7. Rostislav SvobodaAug 10, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.