Date: Wed, 13 Dec 2000 10:13:45 -0800 From: Doug Barton <DougB@FreeBSD.org> To: Gilles.Guerrini@alcatel.fr Cc: freebsd-questions@FreeBSD.org Subject: Re: mergemaster Message-ID: <3A37BC59.115C4737@FreeBSD.org> References: <C12569B2.0054F8EE.00@frmail19.netfr.alcatel.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
Gilles.Guerrini@alcatel.fr wrote:
>
> Hello,
> i want to update my FreeBSD from 4.1 release to 4.2 RELEASE. What a good idea !!
> When I do a 'mergemaster', by default, if there is no personnal change, must I 'delete' the new file
> or must I 'install' it ??
You should really install the new files if there are no personal
changes, and if you do have personal changes you should merge the old
with the new, then install that file.
Doug
--
So what I want to know is, where does the RED brick road go?
Do YOU Yahoo!?
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?3A37BC59.115C4737>