{"thread":{"id":"3650","subject":"git merge in FreeBSD","startedAt":"2006-03-15T14:52:44Z","lastAt":"2006-03-15T16:42:57Z","messageCount":2,"participants":["Rajkumar S","Eric Anholt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"17564","messageId":"44182A3C.80701@asianetindia.com","threadId":"3650","inReplyTo":null,"subject":"git merge in FreeBSD","fromName":"Rajkumar S","fromEmail":"rajkumars@asianetindia.com","sentAt":"2006-03-15T14:52:44Z","receivedAt":"2006-03-15T14:52:44Z","isPatch":false,"sender":{"key":"rajkumars@asianetindia.com","avatar":null},"body":"Hi,\n\nI get a \"git-merge-recursive: not found\" error when I try to do a merge in FreeBSD. Same \ncommand in Linux does not give an error.\n\n# git merge \"Merging from updates\" RELENG_1 RELENG_1_origin\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\n/usr/local/bin/git-merge: git-merge-recursive: not found\nNo merge strategy handled the merge.\n\nI am using git version 1.2.4.gea75 in FreeBSD 6\n\nraj\n"},{"id":"17565","messageId":"1142440978.951.46.camel@leguin","threadId":"3650","inReplyTo":"44182A3C.80701@asianetindia.com","subject":"Re: git merge in FreeBSD","fromName":"Eric Anholt","fromEmail":"eric@anholt.net","sentAt":"2006-03-15T16:42:57Z","receivedAt":"2006-03-15T16:42:57Z","isPatch":false,"sender":{"key":"eric@anholt.net","avatar":null},"body":"On Wed, 2006-03-15 at 20:22 +0530, Rajkumar S wrote:\n> Hi,\n> \n> I get a \"git-merge-recursive: not found\" error when I try to do a merge in FreeBSD. Same \n> command in Linux does not give an error.\n> \n> # git merge \"Merging from updates\" RELENG_1 RELENG_1_origin\n> Trying really trivial in-index merge...\n> fatal: Merge requires file-level merging\n> Nope.\n> /usr/local/bin/git-merge: git-merge-recursive: not found\n> No merge strategy handled the merge.\n> \n> I am using git version 1.2.4.gea75 in FreeBSD 6\n\nThis is probably the wrong python path in git-merge-recursive.  I've got\na fix on my laptop for this and gitk, but I haven't tried submitting it\nagain (I guess email was hosed, or it got lost, when I sent the first\nversion of it directly to Junio).\n\nBut might I also recommend ports/devel/git?  I'm keeping it pretty up to\ndate, and using it on a daily basis.\n\n-- \nEric Anholt                     anholt@FreeBSD.org\neric@anholt.net                 eric.anholt@intel.com\n"}]}