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

git 1.4.0 usability problem

From
JGJeff Garzik <jeff@garzik.org>
Date
Jun 18, 2006, 13:40 UTC
Message-ID
<449557B6.1080907@garzik.org>

Now that kernel 2.6.17 is out, I updated all my repositories to be based against that kernel. And for each repository I updated, my merge was rejected, due to an error similar to:

> fatal: Untracked working tree file '.gitignore' would be overwritten by merge.

I am only able to merge if I delete files in the working directory, so that git stops complaining on merge.

This behavior is new with git 1.4.0, which Fedora Extras just added. I verified that merges work as expected in git 1.3.3, the last version Fedora Extras shipped prior to 1.4.0.

This behavior is a definite regression, that impacts workflow :(
Here is how to reproduce:

git clone -l $url/torvalds/linux-2.6.git tmp-2.6 cd tmp-2.6 cp .git/refs/tags/v2.6.12 .git/refs/heads/tmp git checkout -f tmp git pull . master # watch OBVIOUS FAST-FORWARD MERGE complain about untracked # working tree files

Regards,
	Jeff
Next: Ryan Anderson
Message 1 of 17 in “git 1.4.0 usability problem”
  1. Jeff GarzikJun 18, 2006
  2. Ryan AndersonJun 18, 2006
  3. Ryan AndersonJun 18, 2006
  4. Junio C HamanoJun 18, 2006
  5. Junio C HamanoJun 18, 2006
  6. Jeff GarzikJun 18, 2006
  7. Junio C HamanoJun 19, 2006
  8. Jeff GarzikJun 20, 2006
  9. Ryan AndersonJun 20, 2006
  10. Junio C HamanoJun 20, 2006
  11. checkout -f: do not leave untracked working tree files.Junio C Hamano, Jun 20, 2006
  12. Santi BéjarJun 20, 2006
  13. Junio C HamanoJun 20, 2006
  14. Alexander LitvinovJun 20, 2006
  15. Junio C HamanoJun 20, 2006
  16. Alexander LitvinovJun 20, 2006
  17. Carl WorthJun 20, 2006

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.