Date: Tue, 19 Jun 2001 07:47:08 +0200 From: Erik Trulsson <ertr1013@student.uu.se> To: Keith Spencer <bsd2000au@yahoo.com.au> Cc: fbsd <freebsd-questions@FreeBSD.ORG> Subject: Re: how do I use mergemaster? Message-ID: <20010619074707.A50989@student.uu.se> In-Reply-To: <20010619053329.16735.qmail@web12007.mail.yahoo.com> References: <20010619053329.16735.qmail@web12007.mail.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 19, 2001 at 03:33:29PM +1000, Keith Spencer wrote: > Hi folks, > I have successfully CVS upped with your help and seek > to make installworld etc. > I am using a cheat sheet and it tells me to now use.. > /usr/sbin/mergemaster -v > > I am doing so but what do I do with it? It is asking > me to install delete merge temporary files. > What options do I choose? If it is a file that you have not made any local modicfications on you should choose 'install'. If it is a file that you have changed choose 'merge'. > i= seems to give " problem, leaving to deal with" There is a bug in mergemaster in 4.3-STABLE that causes it to give this error message. Ignore it. > m= gives me some editor I have no idea how to use Try pressing 'h' to get help. > ...hmmm > I press default to leave to deal and it does it for > every file (lots) Id be here forever! > ANY HELP IS APPRECIATED. > I am tearing my hair out here > Regards > Keith > -- <Insert your favourite quote here.> Erik Trulsson ertr1013@student.uu.se 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?20010619074707.A50989>