From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: gzimak@yahoo.com (Gary Z) Newsgroups: gmane.emacs.help Subject: Trying to merge two files with emacs... need help! Date: 11 May 2004 20:25:04 -0700 Organization: http://groups.google.com Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: NNTP-Posting-Host: deer.gmane.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Trace: sea.gmane.org 1084332833 25762 80.91.224.253 (12 May 2004 03:33:53 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 12 May 2004 03:33:53 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed May 12 05:33:49 2004 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BNkVB-0005Fg-00 for ; Wed, 12 May 2004 05:33:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BNkTi-0000OC-S6 for geh-help-gnu-emacs@m.gmane.org; Tue, 11 May 2004 23:32:18 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!postnews1.google.com!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 31 Original-NNTP-Posting-Host: 4.239.219.6 Original-X-Trace: posting.google.com 1084332305 8880 127.0.0.1 (12 May 2004 03:25:05 GMT) Original-X-Complaints-To: groups-abuse@google.com Original-NNTP-Posting-Date: Wed, 12 May 2004 03:25:05 +0000 (UTC) Original-Xref: shelby.stanford.edu gnu.emacs.help:123137 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:18428 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:18428 I'm new to emacs and I'm trying to use it to merge two files into one. Some time ago, I watched a co-worker step through a file and selectively merge changes into it from another file. Unfortunately, I don't recall how he did it! Currently, I'm opening a file with emacs, selecting diff (2 files) from the menu, specifying the current file and the file I want to merge into the current file. I hit the space bar and the first difference is displayed. I am able to accept what is in buffer a or buffer b, but I can't figure out how to combine both of them. The buffers look something like this: Buffer A here is the first line. here is the second line. Buffer B here is the third line. here is the fourth line. The result that I want is: here is the first line. here is the second line. here is the third line. here is the fourth line. Any ideas on how I can do this? I guess it's tricky because emacs views it as a conflict, but I want to combine everything, not choose one or the other. Thanks, Gary