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

Re: .gitignore vs untracked working file

From
Rostislav Svoboda <rostislav.svoboda@gmail.com>
Date
Aug 10, 2009, 13:49 UTC
Message-ID
<286817520908100649j4d369a10p22c667ee077daa47@mail.gmail.com>
In-Reply-To
<4A801D48.3020902@viscovery.net>
Show 5 quoted lines
> This is not only about ignored files, but untracked files. And the check
> is already there: git said:
>
> Untracked working tree file 'Project/bin/path/file.jjt' would be
> overwritten by merge.

Well the meaning of the error message is clear to you but it wasn't for me. I simply would not ask if I knew how to correctly interpret it. I hope I'll have a time to make a little improvement here...

Bost
PS: ...and you can reject it if you don't agree :-)
Previous: Johannes Sixt
Message 7 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.