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

Re: [RFC/ PATCH 5/5] t7609: test merge and checkout error messages

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jun 9, 2010, 20:47 UTC
Message-ID
<vpqtypcx7a9.fsf@bauges.imag.fr>
In-Reply-To
<1276087446-25112-7-git-send-email-diane.gasselin@ensimag.imag.fr>
Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:
> +error: Untracked working tree files:
> +	five
> +would be overwritten by merge.
> +EOF

In my experience, newbies are often confused by this message (typical example is students who don't believe me when I tell them not to exchange files by email, getting untracked files from their co-workers outside Git, and then trying to pull).

Perhaps this deserves an advice like the one we have for modified files:

Show 6 quoted lines
> +error: Your local changes to the files:
> +	two
> +	three
> +	four
> +would be overwritten by merge.
> +Please, commit your changes or stash them before you can merge.
(also disabled by advice.commitBeforeMerge)
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Diane GasselinNext: Diane Gasselin
Message 8 of 21 in “unpack_trees: nicer error messages”
  1. 0/5 unpack_trees: nicer error messagesDiane Gasselin, Jun 9, 2010
  2. 0/5 unpack_trees: nicer error messagesDiane Gasselin, Jun 9, 2010
  3. 1/5 tree-walk: do not stop when an error is detectedDiane Gasselin, Jun 9, 2010
  4. 2/5 unpack_trees: group errors by typeDiane Gasselin, Jun 9, 2010
  5. 3/5 unpack_trees_options: update porcelain messagesDiane Gasselin, Jun 9, 2010
  6. 4/5 t3030: update porcelain expected messageDiane Gasselin, Jun 9, 2010
  7. 5/5 t7609: test merge and checkout error messagesDiane Gasselin, Jun 9, 2010
  8. Matthieu MoyJun 9, 2010
  9. Diane GasselinJun 9, 2010
  10. Matthieu MoyJun 9, 2010
  11. Junio C HamanoJun 9, 2010
  12. Matthieu MoyJun 9, 2010
  13. Jeff KingJun 10, 2010
  14. Diane GasselinJun 10, 2010
  15. Diane GasselinJun 9, 2010
  16. Junio C HamanoJun 9, 2010
  17. Diane GasselinJun 10, 2010
  18. Matthieu MoyJun 9, 2010
  19. Junio C HamanoJun 9, 2010
  20. Diane GasselinJun 9, 2010
  21. Matthieu MoyJun 9, 2010

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.