Skip site navigation (1)Skip section navigation (2)
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
Message-ID:  <Pine.LNX.4.33.0105221453220.7586-100000@reality.dynip.com>
In-Reply-To: <200105221845.OAA08156@scarlet.my.domain>

next in thread | previous in thread | raw e-mail | index | archive | help

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.33.0105221453220.7586-100000>