Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Feb 2001 00:19:24 +0000
From:      Kwangyul SEO <skyul@postech.ac.kr>
To:        Paul Andrews <andrews@powersurfr.com>
Cc:        freebsd-questions <freebsd-questions@FreeBSD.org>
Subject:   Re: mergmaster
Message-ID:  <20010203001924.A1196@shell.postech.ac.kr>
In-Reply-To: <004001c08d28$1b1b5c00$b13e6c18@videon.ca>; from andrews@powersurfr.com on Fri, Feb 02, 2001 at 07:54:55AM -0700
References:  <004001c08d28$1b1b5c00$b13e6c18@videon.ca>

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

It is clear. If you have set up your files and know what is going on,
it is better to merge the two files together. But if you don't know what
it is and haven't changed anything, then just install files in temporary
directory.

On Fri, Feb 02, 2001 at 07:54:55AM -0700, Paul Andrews wrote:
> Just a quick question as I know questions about mergemaster have come up
> before. I recently installed 4.2-RELEASE and have not made any modifications
> to the system from the install. I have just finished
> updating my kernel to 4.2-STABLE along with running make buildworld and
> installworld... I am now in the process of running mergemaster... My
> question is:
> 
> Is it safe to replace the installed file with the file stored in temporary
> root or is it better to merge the two files together?
> 
> Thank in advance.
> 
> Paul Andrews
> Internet: andrews@powersurfr.com
> 
> 
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-questions" in the body of the message
> 

-- 
Thanks
icq UIN 104946812, Kwangyul Seo <skyul@postech.edu>


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?20010203001924.A1196>