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

git merge in FreeBSD

From
RSRajkumar S <rajkumars@asianetindia.com>
Date
Mar 15, 2006, 14:52 UTC
Message-ID
<44182A3C.80701@asianetindia.com>
Hi,

I get a "git-merge-recursive: not found" error when I try to do a merge in FreeBSD. Same command in Linux does not give an error.

# git merge "Merging from updates" RELENG_1 RELENG_1_origin Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. /usr/local/bin/git-merge: git-merge-recursive: not found No merge strategy handled the merge.

I am using git version 1.2.4.gea75 in FreeBSD 6
raj
Next: Eric Anholt
Message 1 of 2 in “git merge in FreeBSD”
  1. Rajkumar SMar 15, 2006
  2. Eric AnholtMar 15, 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.