Date: Tue, 22 May 2001 16:30:25 -0400 (EDT) From: User Ipt Ian Patrick Thomas <ipthomas_77@yahoo.com> To: mds@reality.dynip.com (Michael Sharp) Cc: freebsd-questions@freebsd.org Subject: Re: choices on mergemaster Message-ID: <200105222030.QAA00559@scarlet.my.domain> In-Reply-To: <Pine.LNX.4.33.0105221453220.7586-100000@reality.dynip.com> from Michael Sharp at "May 22, 2001 02:54:14 pm"
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105222030.QAA00559>