From owner-freebsd-questions Tue May 22 11:46:54 2001 Delivered-To: freebsd-questions@freebsd.org Received: from gull.mail.pas.earthlink.net (gull.mail.pas.earthlink.net [207.217.121.85]) by hub.freebsd.org (Postfix) with ESMTP id E5AB337B42C for ; Tue, 22 May 2001 11:46:49 -0700 (PDT) (envelope-from ipthomas_77@yahoo.com) Received: from scarlet.my.domain (1Cust153.tnt2.buffalo.ny.da.uu.net [63.20.90.153]) by gull.mail.pas.earthlink.net (EL-8_9_3_3/8.9.3) with ESMTP id LAA10615 for ; Tue, 22 May 2001 11:46:39 -0700 (PDT) Received: (from ipt@localhost) by scarlet.my.domain (8.9.3/8.9.3) id OAA08156 for freebsd-questions@freebsd.org; Tue, 22 May 2001 14:45:50 -0400 (EDT) (envelope-from ipt) From: User Ipt Ian Patrick Thomas Message-Id: <200105221845.OAA08156@scarlet.my.domain> Subject: choices on mergemaster To: freebsd-questions@freebsd.org (Questions) Date: Tue, 22 May 2001 14:45:44 -0400 (EDT) Operating-System: FreeBSD X-Mailer: ELM [version 2.4ME+ PL54 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 I'm about to use mergemaster after having cvsupped from 3.2 Release to 3.x Stable. I backed up my /etc directory. Mergemaster gives four choices and I was wondering which one to pick. I havn't really touched to much in /etc. Should I go and install all the new files and merge the ones I remember adding to should I just install all the new files? Should I merge all the files or leave them in temproot to be dealt with later? Ian -- Have blue screens given you the blues, go to www.freebsd.org for the cure. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message