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

Re: [PATCH] Documentation: warn against merging in a dirty tree

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 15, 2008, 23:42 UTC
Message-ID
<7vtzch7z7u.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1221518994-26111-2-git-send-email-trast@student.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
> Merging in a dirty tree is usually a bad idea because you need to
> reset --hard to abort; but the docs didn't say anything about it.

Strictly speaking, you do not have to worry about anything if (1) all of your work tree changes are easily reproducible (Linus's keeping a new EXTRAVERSION in his Makefile, never staged nor committed is an often cited example), or (2) you know beforehand that a merge with the other party will not touch the part you have local changes that you care about.

In other words, you need to know what you are doing, and a warning with "usually it is a bad idea" would be an appropriate thing to do.

Previous: Thomas RastNext: Avery Pennarun
Message 4 of 17 in “[IRC/patches] Failed octopus merge does not clean up”
  1. Thomas RastSep 15, 2008
  2. Add test that checks octopus merge cleanupThomas Rast, Sep 15, 2008
  3. Documentation: warn against merging in a dirty treeThomas Rast, Sep 15, 2008
  4. Junio C HamanoSep 15, 2008
  5. Avery PennarunSep 15, 2008
  6. Junio C HamanoSep 16, 2008
  7. Linus TorvaldsSep 18, 2008
  8. Avery PennarunSep 18, 2008
  9. Junio C HamanoSep 19, 2008
  10. Junio C HamanoSep 15, 2008
  11. Thomas RastSep 15, 2008
  12. Junio C HamanoSep 16, 2008
  13. Jakub NarebskiSep 16, 2008
  14. Andreas EricssonSep 17, 2008
  15. Jakub NarebskiSep 17, 2008
  16. Miklos VajnaSep 17, 2008
  17. Andreas EricssonSep 17, 2008

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.