14.1 upgrade from 14.0; loop editing FreeBSD.conf

[marvw]

Followed Release upgrade instructions until error message: "The following file could not be merged automatically: ..."

Is the error in url listing both latest and quarterly or something else. I tried commenting out quarterly, but on save and exit the installer returned to: "Press Enter.. resolve the conflicts manually"

Marv

 

[SirDice]

This is why you shouldn't edit /etc/pkg/FreeBSD.conf. Fix it so it looks like this:

#
# To disable this repository, instead of modifying or removing this file,
# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
#
#   mkdir -p /usr/local/etc/pkg/repos
#   echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
#

FreeBSD: {
  url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly",
  mirror_type: "srv",
  signature_type: "fingerprints",
  fingerprints: "/usr/share/keys/pkg",
  enabled: yes
}