Date: Sun, 13 Oct 2002 18:41:05 +0100 From: Adrian Wontroba <aw1@stade.co.uk> To: Trish Lynch <trish@bsdunix.net> Cc: freebsd-stable@FreeBSD.ORG Subject: mergemaster (was Re: Ifconfig config of gif tunnels) Message-ID: <20021013184105.A20385@titus.hanley.stade.co.uk> In-Reply-To: <20021013130138.G523-100000@femme.sapphite.org>; from trish@bsdunix.net on Sun, Oct 13, 2002 at 01:05:27PM -0400 References: <20021013172810.A19177@titus.hanley.stade.co.uk> <20021013130138.G523-100000@femme.sapphite.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Oct 13, 2002 at 01:05:27PM -0400, Trish Lynch wrote: > I';ve done something semi-simple to manage things that possibly might get > broken by mergemaster. I don't recall ever having anything broken by mergemaster. I have broken things for myself by failing to drive mergemaster properly, e.g. my not noticing that a file (i)nstalled by mergemaster should have been (m)erged, to preserve local changes. The incidence of this has much reduced since I adopted the convention of flagging files I have modified with a "# **** MODIFIED ****" line near the top. -- Adrian Wontroba To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021013184105.A20385>