From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Phillip Lord Newsgroups: gmane.emacs.help Subject: Re: PCL-CVS, How To Merge? Date: 19 Jun 2003 10:46:02 +0100 Organization: Dept of Computer Science, University of Manchester, U.K. Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1056017145 21606 80.91.224.249 (19 Jun 2003 10:05:45 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Thu, 19 Jun 2003 10:05:45 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Thu Jun 19 12:05:43 2003 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19SwIZ-0005cK-00 for ; Thu, 19 Jun 2003 12:05:43 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.20) id 19SwIb-0005v2-JQ for gnu-help-gnu-emacs@m.gmane.org; Thu, 19 Jun 2003 06:05:45 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!cyclone.bc.net!newsfeed.media.kyoto-u.ac.jp!newsfeed.icl.net!newsfeed.fjserv.net!newsfeed.freenet.de!newsfeed.stueberl.de!ecngs!feeder.ecngs.de!zen.net.uk!130.88.203.18.MISMATCH!peernews.mcc.ac.uk!cs.man.ac.uk!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 19 Original-NNTP-Posting-Host: rpc71.cs.man.ac.uk Original-X-Trace: wapping.cs.man.ac.uk 1056015962 21986 130.88.198.228 (19 Jun 2003 09:46:02 GMT) Original-X-Complaints-To: news@wapping.cs.man.ac.uk Original-NNTP-Posting-Date: Thu, 19 Jun 2003 09:46:02 +0000 (UTC) User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2.93 Original-Xref: shelby.stanford.edu gnu.emacs.help:114575 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:11067 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:11067 >>>>> "Galen" == Galen Boyer writes: Galen> Point is on line saying need-merge. What is the command to Galen> make this happen? Whenever I hit `d E' on either a marked or Galen> unmarked line, I get the message: Galen> `merge' is not applicable to any of the selected files. Galen> -- Galen Boyer You use "update", which is somewhat confusingly bound to "O". This will result either in "merge" changing to "modified"; that is the changes in the repository have been added to your version without problems, or "conflict" which means CVS can't work it out, in which case you use `vc-resolve-conflicts' on the buffer, which gives you ediff, and lots of colours. Phil