Date: Sat, 14 May 2005 11:57:41 +0930 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: John Hay <jhay@icomtek.csir.co.za> Cc: "Matthew D. Fuller" <fullermd@over-yonder.net> Subject: Re: mergemaster improvement (auto-update for not modified files) Message-ID: <4285621D.7030503@gsoft.com.au> In-Reply-To: <20050513161510.GA97948@zibbi.icomtek.csir.co.za> References: <427743ED.6020200@FreeBSD.org> <4284680E.1060008@FreeBSD.org> <20050513101554.GA1519@over-yonder.net> <428535F5.3060604@gsoft.com.au> <20050513161510.GA97948@zibbi.icomtek.csir.co.za>
next in thread | previous in thread | raw e-mail | index | archive | help
John Hay wrote: >>etcmerge can already do this :) > > Maybe, but last time I tried to use it, I got the feeling that it was > missing a front end. If its cleverness could be married to the ease > of use of mergemaster, we would have a winner. IMVHO Yes, it is a little more difficult to use since it doesn't walk you through resolving conflicts. Still, it is very powerful and in general you don't have to resolve any conflicts so total amount of work required is small. -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Key ID - 7B3FCE8C
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4285621D.7030503>