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
RSRadoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Date
Jan 29, 2006, 12:32 UTC
Message-ID
<43DCB5EA.3030804@gorzow.mm.pl>
In-Reply-To
<43DCB3D8.8010902@gorzow.mm.pl>
Radoslaw Szkodzinski wrote:
Show 7 quoted lines
>> The problem is that merge(1), which is used for file-level merges,
>> couldn't be found. Is it installed on your system? If you use Linux,
>> it is usually found in the "rcs" package in your favorite
>> distribution.
> 
> Also in diffutils (the package with diff3).
>

No, I was wrong. However, diff3 can merge files and should also be supported. It is much lighter than full rcs.

Parameters: diff3 -m local base new > mergedlocal

-- 
GPG Key id:  0xD1F10BA2
Fingerprint: 96E2 304A B9C4 949A 10A0  9105 9543 0453 D1F1 0BA2

AstralStorm
Previous: Radoslaw SzkodzinskiNext: Roberto Nibali
Message 6 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.