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

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

From
Linus Torvalds <torvalds@osdl.org>
Date
Sep 21, 2005, 20:20 UTC
Message-ID
<Pine.LNX.4.58.0509211318550.2553@g5.osdl.org>
In-Reply-To
<Pine.LNX.4.58.0509211310150.2553@g5.osdl.org>
On Wed, 21 Sep 2005, Linus Torvalds wrote:
> 
> If the new merge policies do not allow that, then the new merge policies 
> are incredibly broken.
I just checked.
It _is_ incredibly broken. 
It will do 
	echo "Rewinding the tree to pristine..."
	git reset --hard $head

if any merge strategy every fails, so that check is needed for the new merger.

This makes merges totally unusable. It feels like the dark ages.
		Linus
Previous: Linus TorvaldsNext: Junio C Hamano
Message 2 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.