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

Re: Is 'merge' in your path?

From
Andreas Ericsson <ae@op5.se>
Date
Mar 29, 2006, 08:47 UTC
Message-ID
<442A49BB.2060200@op5.se>
In-Reply-To
<200603290342.40970.len.brown@intel.com>
Len Brown wrote:
Show 9 quoted lines
> trying to do a merge on my laptop using git as of today,
> but it bombs out.  anybody seen this?
> 
> lenb@toshiba:~/src> git --version
> git version 1.3-rc1.GIT
> 
> lenb@toshiba:~/src/linux-acpi-2.6> /lab/bin/git.update test
> Trying really trivial in-index merge...
> fatal: Merge requires file-level merging
....
Show 8 quoted lines
> Failed to execute 'merge'. merge(1) is used as the file-level merge tool. Is 
> 'merge' in your path?
> No merge strategy handled the merge.
> lenb@toshiba:~/src/linux-acpi-2.6> which git-merge
> /home/lenb/bin/git-merge
> lenb@toshiba:~/src/linux-acpi-2.6> which git
> /home/lenb/bin/git
> lenb@toshiba:~/src/linux-acpi-2.6>

What does "which merge" tell you? If it turns up blank, you know the problem. The merge program is usually found in the rcs package.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
Previous: Len Brown
Message 2 of 2 in “Is 'merge' in your path?”
  1. Len BrownMar 29, 2006
  2. Andreas EricssonMar 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.