I usually install my upgrades by just rebuilding the system. This time, I tried the
Is there a notation explaining these conflicts and their resolution in vi in the directions somewhere?
I was able to get through it by doing my usual "100 Mistakes a Day." However, I thought those notations with the <<<< and the ==== marks might be confusing. How is a newbie to understand this if this is not covered in the handbook? Is everyone else finding out the hard way, too?
My conflicts were in ssh-related programs. Failure to resolve the conflicts by editing the files was creating a situation where I was locked out of the computer. I got around it by using a backup. It seems like this might be an area where a lack of easy-to-find documentation might cause problems for someone new. Like, when I just accepted the files as-is, without editing them, sshd would not work. Since a restart is a part of the upgrade process, that could be bad luck for somebody.
Can we get the handbook edited to mention this use of mergemaster with
freebsd-update upgrade
method. Similar to what's outlined here: https://docs.freebsd.org/en_US.ISO8859-1/books/handbook/updating-upgrading-freebsdupdate.html . I had some conflicts with an unusual notation, that appear to be related to using a program called mergemaster. Is there a notation explaining these conflicts and their resolution in vi in the directions somewhere?
I was able to get through it by doing my usual "100 Mistakes a Day." However, I thought those notations with the <<<< and the ==== marks might be confusing. How is a newbie to understand this if this is not covered in the handbook? Is everyone else finding out the hard way, too?
My conflicts were in ssh-related programs. Failure to resolve the conflicts by editing the files was creating a situation where I was locked out of the computer. I got around it by using a backup. It seems like this might be an area where a lack of easy-to-find documentation might cause problems for someone new. Like, when I just accepted the files as-is, without editing them, sshd would not work. Since a restart is a part of the upgrade process, that could be bad luck for somebody.
Can we get the handbook edited to mention this use of mergemaster with
freebsd-update upgrade
?