The following file could not be merged automatically: /etc/auto_master
Press Enter to edit this file in /usr/bin/vi and resolve the conflicts
manually…
<<<<<<< current version
$FreeBSD: releng/11.3/etc/auto_master 310007 2016-12-13 04:44:06Z dteske $
=======
13.3-RELEASE
Automounter master map, see auto_master(5) for details.
/net -hosts -nobrowse,nosuid,intr
When using the -media special map, make sure to edit devd.conf(5)
to move the call to “automount -c” out of the comments section.
#/media -media -nosuid,noatime
#/- -noauto
~
~
~
~
~
~
~
~
how do i resolve this, trying to upgrade my jail