Date: Tue, 16 Feb 2010 12:55:40 +0200 From: "Peter Kirk" <peterki@korbitec.com> To: <freebsd-questions@freebsd.org> Subject: freebsd-update - Automatic merge Message-ID: <490F273F58BE854EBF3D5BE7CF7A8FC30393C797@cptisnmail01.korbitec.int>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?490F273F58BE854EBF3D5BE7CF7A8FC30393C797>