[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Trying to merge two files with emacs... need help!
From: |
Gary Z |
Subject: |
Re: Trying to merge two files with emacs... need help! |
Date: |
12 May 2004 04:50:45 -0700 |
Eli Zaretskii <eliz@gnu.org> wrote in message
news:<mailman.4725.1084338189.1061.help-gnu-emacs@gnu.org>...
> > From: gzimak@yahoo.com (Gary Z)
> > Newsgroups: gnu.emacs.help
> > Date: 11 May 2004 20:25:04 -0700
> >
> > 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 hope that was a typo, and you actually meant to say that you select
> "Merge" from the menu bar, not "Diff".
It actually was a typo, but not the one you suggested. I'm chosing
"Compare Two files" from the menu. I was trying not to use Merge,
since I wanted more control over how conflicts are handled. Am I going
about it the wrong way?