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

Please undo "Use git-merge instead of git-resolve in git-pull"

From
Linus Torvalds <torvalds@osdl.org>
Date
Sep 21, 2005, 20:15 UTC
Message-ID
<Pine.LNX.4.58.0509211310150.2553@g5.osdl.org>
The new merge is totally unusable in real life.
I get 
	Need real merge but the working tree has local changes.

which is totally bogus. Sure, my working tree has local changes, but they have absolutely nothing to do with the stuff I merge. I almost _always_ keep local changes in my tree, and I worked hard to make sure that merging works well even despite that, and does the right thing.

Local changes are a problem ONLY IF THOSE LOCAL CHANGES INTERFERE WITH THE MERGE.

If the new merge policies do not allow that, then the new merge policies are incredibly broken. The old one did exactly the right thing for this case, and "git-read-tree -m" did

	Entry '%s' would be overwritten by merge. Cannot merge.
only if a file that actually needed merging was different.
			Linus
Next: Linus Torvalds
Message 1 of 10 in “Please undo "Use git-merge instead of git-resolve in git-pull"”
  1. Linus TorvaldsSep 21, 2005
  2. Linus TorvaldsSep 21, 2005
  3. Junio C HamanoSep 21, 2005
  4. Linus TorvaldsSep 21, 2005
  5. David S. MillerSep 22, 2005
  6. Linus TorvaldsSep 22, 2005
  7. Olivier GalibertSep 22, 2005
  8. Martin LanghoffSep 22, 2005
  9. Linus TorvaldsSep 22, 2005
  10. Petr BaudisSep 23, 2005

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.