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

Re: No merge strategy handled the merge (git version 1.1.GIT)

From
Junio C Hamano <junkio@cox.net>
Date
Jan 29, 2006, 23:50 UTC
Message-ID
<7vhd7mh9vo.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<43DD52ED.7090503@drugphish.ch>
Roberto Nibali <ratz@drugphish.ch> writes:
> ... "not reading code before commenting" omitted ...
> On top of that "-D" did/does
> not seem to be documented...

Well, initially, not documenting it was done somewhat deliberately, because -D is an operation that would lose information. Running the command with -d option would reveal its existence after telling the user why we do not let it be deleted by default.

Previous: Roberto Nibali
Message 8 of 8 in “No merge strategy handled the merge (git version 1.1.GIT)”
  1. Roberto NibaliJan 28, 2006
  2. Fredrik KuivinenJan 29, 2006
  3. merge-recursive: Improve the error message printed when merge(1) isn't found.Fredrik Kuivinen, Jan 29, 2006
  4. Roberto NibaliJan 29, 2006
  5. Radoslaw SzkodzinskiJan 29, 2006
  6. Radoslaw SzkodzinskiJan 29, 2006
  7. Roberto NibaliJan 29, 2006
  8. Junio C HamanoJan 29, 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.