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

Re: .gitignore vs untracked working file

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Aug 10, 2009, 13:14 UTC
Message-ID
<4A801D48.3020902@viscovery.net>
In-Reply-To
<286817520908100559u6cdcaab0u3a7fdb92cd43eed9@mail.gmail.com>
Rostislav Svoboda schrieb:
Show 9 quoted lines
> $ git ls-tree master Project/bin/path/file.jjt
> 100644 blob 8d5e24f12c37fd1a435de2d4402591f5b0c2a3cc
> Project/bin/path/file.jjt
> 
> There's a file.jjt in the repo already! But guys! I bet I'm not the
> first one having this problem. Do you think it would be wise to have a
> kind of a check returning
>     'The file '...' ignored in the branch X is not ignored in the
> branch Y (or something)'

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.

-- Hannes
Previous: Rostislav SvobodaNext: Rostislav Svoboda
Message 6 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.