From owner-freebsd-questions  Tue May 22 11:50: 1 2001
Delivered-To: freebsd-questions@freebsd.org
Received: from reality.dynip.com (cae26-118-070.sc.rr.com [66.26.118.70])
	by hub.freebsd.org (Postfix) with ESMTP id 27D7537B422
	for <freebsd-questions@FreeBSD.ORG>; Tue, 22 May 2001 11:49:58 -0700 (PDT)
	(envelope-from mds@reality.dynip.com)
Received: from localhost (mds@localhost)
	by reality.dynip.com (8.11.2/8.11.2) with ESMTP id f4MIsEx07588;
	Tue, 22 May 2001 14:54:14 -0400
Date: Tue, 22 May 2001 14:54:14 -0400 (EDT)
From: Michael Sharp <mds@reality.dynip.com>
To: User Ipt Ian Patrick Thomas <ipthomas_77@yahoo.com>
Cc: Questions <freebsd-questions@FreeBSD.ORG>
Subject: Re: choices on mergemaster
In-Reply-To: <200105221845.OAA08156@scarlet.my.domain>
Message-ID: <Pine.LNX.4.33.0105221453220.7586-100000@reality.dynip.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
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


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
>
>


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