From owner-freebsd-questions@FreeBSD.ORG  Tue Feb 16 11:33:01 2010
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C76E3106566B
	for <freebsd-questions@freebsd.org>;
	Tue, 16 Feb 2010 11:33:01 +0000 (UTC)
	(envelope-from peterki@korbitec.com)
Received: from spool.korbitec.com (spool.korbitec.com [192.96.88.150])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B6FF8FC12
	for <freebsd-questions@freebsd.org>;
	Tue, 16 Feb 2010 11:33:01 +0000 (UTC)
Received: from [10.4.2.10] (port=24158 helo=cptisnmail01.korbitec.int)
	by spool.korbitec.com with esmtp (Exim 4.69 (FreeBSD))
	(envelope-from <peterki@korbitec.com>) id 1NhKuA-000Kii-QQ
	for freebsd-questions@freebsd.org; Tue, 16 Feb 2010 12:43:46 +0200
X-MimeOLE: Produced By Microsoft Exchange V6.5
Content-class: urn:content-classes:message
MIME-Version: 1.0
Date: Tue, 16 Feb 2010 12:43:45 +0200
Message-ID: <490F273F58BE854EBF3D5BE7CF7A8FC30393C782@cptisnmail01.korbitec.int>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: freebsd-update - Automatic merge
Thread-Index: Acqu9Onl2VFhpt+0Ru+RRoSNK1Ss9A==
From: "Peter Kirk" <peterki@korbitec.com>
To: <freebsd-questions@freebsd.org.>
X-Spam-Score: 
X-Spam-Report: 
X-Spam-Flag: 
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
X-Content-Filtered-By: Mailman/MimeDel 2.1.5
Cc: 
Subject: freebsd-update - Automatic merge
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2010 11:33:01 -0000

Updating freebsd 7.2 to 8 and fan the following command=20

freebsd-update upgrade -r 8.0-RELEASE

Everything goes through fine but then it gets to a point and its says=20

The following file could not be merged automatically: /etc/amd.map
Press Enter to edit this file in vi and resolve the conflicts
manually...

It goes through hundreds of files, and it wants me to do the editing all
myself, is there not automatic way to do this or just a simple yes no
like mergemaster would ask?  This would take forever on our production
servers