Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Jul 2017 16:08:53 -0700
From:      Melissa Pilgrim <melissa@bluerosetech.com>
To:        questions@freebsd.org
Subject:   Upgrading 11.0 to 11.1, /etc/mtree/BSD.usr.dist requires hand editting
Message-ID:  <8d8ac6c7-df53-84f4-9c52-b6688242e2e6@bluerosetech.com>

next in thread | raw e-mail | index | archive | help
# freebsd-update -r 11.1-RELEASE upgrade
[metadata and patch fetching stuff happens]

Attempting to automatically merge changes in files... done.

The following file could not be merged automatically: 
/etc/mtree/BSD.usr.dist


It seems like these files should never need manual merging?



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8d8ac6c7-df53-84f4-9c52-b6688242e2e6>