From owner-freebsd-questions Mon Jun 18 22:47:42 2001 Delivered-To: freebsd-questions@freebsd.org Received: from mailf.telia.com (mailf.telia.com [194.22.194.25]) by hub.freebsd.org (Postfix) with ESMTP id 5359F37B406 for ; Mon, 18 Jun 2001 22:47:38 -0700 (PDT) (envelope-from ertr1013@student.uu.se) Received: from d1o913.telia.com (d1o913.telia.com [195.252.44.241]) by mailf.telia.com (8.11.2/8.11.0) with ESMTP id f5J5laJ25139 for ; Tue, 19 Jun 2001 07:47:37 +0200 (CEST) Received: from ertr1013.student.uu.se (h185n2fls20o913.telia.com [212.181.163.185]) by d1o913.telia.com (8.8.8/8.8.8) with SMTP id HAA13942 for ; Tue, 19 Jun 2001 07:47:36 +0200 (CEST) Received: (qmail 51040 invoked by uid 1001); 19 Jun 2001 05:47:08 -0000 Date: Tue, 19 Jun 2001 07:47:08 +0200 From: Erik Trulsson To: Keith Spencer Cc: fbsd Subject: Re: how do I use mergemaster? Message-ID: <20010619074707.A50989@student.uu.se> Mail-Followup-To: Keith Spencer , fbsd References: <20010619053329.16735.qmail@web12007.mail.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20010619053329.16735.qmail@web12007.mail.yahoo.com> User-Agent: Mutt/1.3.19i Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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 > -- Erik Trulsson ertr1013@student.uu.se To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message