From owner-freebsd-questions  Tue May 22 13:31: 6 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from falcon.mail.pas.earthlink.net (falcon.mail.pas.earthlink.net [207.217.120.74])
	by hub.freebsd.org (Postfix) with ESMTP id C492937B422
	for <freebsd-questions@freebsd.org>; Tue, 22 May 2001 13:31:03 -0700 (PDT)
	(envelope-from ipthomas_77@yahoo.com)
Received: from scarlet.my.domain (1Cust37.tnt5.buffalo.ny.da.uu.net [63.20.93.37])
	by falcon.mail.pas.earthlink.net (EL-8_9_3_3/8.9.3) with ESMTP id NAA05250;
	Tue, 22 May 2001 13:30:43 -0700 (PDT)
Received: (from ipt@localhost)
	by scarlet.my.domain (8.9.3/8.9.3) id QAA00559;
	Tue, 22 May 2001 16:30:26 -0400 (EDT)
	(envelope-from ipt)
From: User Ipt Ian Patrick Thomas <ipthomas_77@yahoo.com>
Message-Id: <200105222030.QAA00559@scarlet.my.domain>
Subject: Re: choices on mergemaster
In-Reply-To: <Pine.LNX.4.33.0105221453220.7586-100000@reality.dynip.com> from Michael Sharp at "May 22, 2001 02:54:14 pm"
To: mds@reality.dynip.com (Michael Sharp)
Date: Tue, 22 May 2001 16:30:25 -0400 (EDT)
Cc: freebsd-questions@freebsd.org
Operating-System: FreeBSD
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-questions>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG

	Thanks.  That is what I did and after a reboot, everything works as far
as I can tell.  

Ian

As told by, Michael Sharp
> 
> for the ones you havent touched, choose install... for the ones you have
> edited, use merge.
> 
> 
> On Tue, 22 May 2001, User Ipt Ian Patrick Thomas wrote:
> 
> > 	I'm about to use mergemaster after having cvsupped from 3.2 Release to
> > 3.x Stable.  I backed up my /etc directory.  Mergemaster gives four choices
> > and I was wondering which one to pick.  I havn't really touched to much in
> > /etc.  Should I go and install all the new files and merge the ones I
> > remember adding to should I just install all the new files?  Should I merge
> > all the files or leave them in temproot to be dealt with later?
> >
> > Ian
> >
> >
> 


-- 
Have blue screens given you the blues, go to www.freebsd.org for the cure.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message