From: Linus Torvalds <torvalds@osdl.org>
To: Wink Saville <wink@saville.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Resolving conflicts
Date: Thu, 30 Nov 2006 23:53:21 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0611302348370.3695@woody.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0611302330000.3695@woody.osdl.org>
On Thu, 30 Nov 2006, Linus Torvalds wrote:
>
> So my guess is that there wasn't actually a conflict at all, but the
> "merge" program (usually in /usr/bin/merge) returned an error for some
> reason. What does "which merge" and "rpm -qf /usr/bin/merge" say?
Side note: the historically more common failure was to not have a merge
program at all, but exactly because that was common, we check for that and
complain about it. So that's not it for you - you do have a 'merge'
program somewhere that git found.
But if it returns the wrong error code, or doesn't do anything at all (ie
you have "merge", but it's not the 3-way merge we expect, or it doesn't
take the "-L" argument we use, or it's simply buggy) then that might
explain the behaviour you report.
Or it might be something totally different. This is just a wild theory.
prev parent reply other threads:[~2006-12-01 7:53 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-01 7:06 Resolving conflicts Wink Saville
2006-12-01 7:30 ` Alan Chandler
2006-12-01 7:41 ` Wink Saville
2006-12-01 8:10 ` Alan Chandler
2006-12-01 7:39 ` Linus Torvalds
2006-12-01 7:52 ` Wink Saville
2006-12-01 7:57 ` Linus Torvalds
2006-12-01 8:00 ` Linus Torvalds
2006-12-01 8:13 ` Alan Chandler
2006-12-01 8:22 ` Wink Saville
2006-12-01 23:47 ` Alan Chandler
2006-12-02 3:04 ` Wink Saville
2006-12-02 4:30 ` Linus Torvalds
2006-12-02 7:55 ` Junio C Hamano
2006-12-02 10:49 ` using xdl_merge(), was " Johannes Schindelin
2006-12-05 17:58 ` Ramsay Jones
2006-12-05 18:28 ` Linus Torvalds
2006-12-05 18:43 ` Junio C Hamano
2006-12-05 18:53 ` Johannes Schindelin
2006-12-05 19:50 ` Junio C Hamano
2006-12-05 21:15 ` [PATCH] xdl_merge(): fix and simplify conflict handling Johannes Schindelin
2006-12-05 22:10 ` Junio C Hamano
2006-12-05 22:24 ` Johannes Schindelin
2006-12-05 22:54 ` Junio C Hamano
2006-12-05 22:27 ` Jakub Narebski
2006-12-05 22:27 ` Johannes Schindelin
2006-12-06 9:48 ` using xdl_merge(), was Re: Resolving conflicts Junio C Hamano
2006-12-06 10:02 ` Johannes Schindelin
2006-12-06 10:13 ` Junio C Hamano
2006-12-06 10:47 ` Johannes Schindelin
2006-12-05 18:36 ` Johannes Schindelin
2006-12-01 7:53 ` Linus Torvalds [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0611302348370.3695@woody.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=wink@saville.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).