git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
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:57:17 -0800 (PST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0611302353580.3695@woody.osdl.org> (raw)
In-Reply-To: <456FDF24.1070001@saville.com>



On Thu, 30 Nov 2006, Wink Saville wrote:
> 
> Earlier had a problem with git wanting merge but didn't have it and
> couldn't figure out which package it was in Ubuntu:( So I symlinked merge
> to kdiff3 which worked at the time:

Ahh. I'm pretty sure that is it.

No, kdiff3 probably doesn't have the same semantics, so better get the 
"real" merge. It's almost certainly in the rcs package, so "emerge rcs" 
should do it.

Or whatever system Ubuntu uses. 


  reply	other threads:[~2006-12-01  7:57 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 [this message]
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

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.0611302353580.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).