From: Eric Anholt <eric@anholt.net>
To: Rajkumar S <rajkumars@asianetindia.com>
Cc: git@vger.kernel.org
Subject: Re: git merge in FreeBSD
Date: Wed, 15 Mar 2006 08:42:57 -0800 [thread overview]
Message-ID: <1142440978.951.46.camel@leguin> (raw)
In-Reply-To: <44182A3C.80701@asianetindia.com>
[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]
On Wed, 2006-03-15 at 20:22 +0530, Rajkumar S wrote:
> 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
This is probably the wrong python path in git-merge-recursive. I've got
a fix on my laptop for this and gitk, but I haven't tried submitting it
again (I guess email was hosed, or it got lost, when I sent the first
version of it directly to Junio).
But might I also recommend ports/devel/git? I'm keeping it pretty up to
date, and using it on a daily basis.
--
Eric Anholt anholt@FreeBSD.org
eric@anholt.net eric.anholt@intel.com
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 187 bytes --]
prev parent reply other threads:[~2006-03-15 16:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-15 14:52 git merge in FreeBSD Rajkumar S
2006-03-15 16:42 ` Eric Anholt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1142440978.951.46.camel@leguin \
--to=eric@anholt.net \
--cc=git@vger.kernel.org \
--cc=rajkumars@asianetindia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).