Date: Sat, 6 Sep 2008 13:28:13 -0400 From: "Michael P. Soulier" <msoulier@digitaltorque.ca> To: freebsd-questions <freebsd-questions@freebsd.org> Subject: alternatives to mergemaster Message-ID: <fb6605670809061028s680b3fffk9f435f8a150eb99d@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
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'm using Git for development, and it's also tremendously good at merging. This makes me kick around ideas for how to integrate it into a freebsd upgrade. Thanks, Mike -- Michael P. Soulier <msoulier@digitaltorque.ca> "Any intelligent fool can make things bigger and more complex... It takes a touch of genius - and a lot of courage to move in the opposite direction." --Albert Einstein
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?fb6605670809061028s680b3fffk9f435f8a150eb99d>