Date: Sat, 06 Sep 2008 20:20:07 +0200 From: Christian Laursen <xi@borderworlds.dk> To: freebsd-questions@freebsd.org Cc: "Michael P. Soulier" <msoulier@digitaltorque.ca> Subject: Re: alternatives to mergemaster Message-ID: <ygf1vzx2l2g.fsf@dominion.borderworlds.dk> In-Reply-To: <fb6605670809061028s680b3fffk9f435f8a150eb99d@mail.gmail.com> (Michael P. Soulier's message of "Sat\, 6 Sep 2008 13\:28\:13 -0400") References: <fb6605670809061028s680b3fffk9f435f8a150eb99d@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
"Michael P. Soulier" <msoulier@digitaltorque.ca> writes:
> The downside of mergemaster is that it is only a 2-way merge, where a
> 3-way would know better than you prompt you for changes that you
> didn't make. This makes mergemaster far more tedious than it has to
> be. Has anyone considered a good 3-way merge tool?
I always run mergemaster in auto upgrade mode. From the man page:
-U Attempt to auto upgrade files that have not been user modi-
fied.
This can also be achieved by putting "AUTO_UPGRADE=yes" in
/etc/mergemaster.rc.
Combined with auto install, mergemaster requires little effort.
--
Christian Laursen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ygf1vzx2l2g.fsf>