Solved freebsd-update "file could not be merged automatically"

D

drhowarddrfine

This is a first for me and I'm not sure where to edit the file shown to me in vi by freebsd-update(). I presume I need to delete the lines between two areas because they contain version 10.0 things versus 10.1 things but I'm confused as to where these "things" start and end. I believe and hope this is the only file I need to change to complete this update.

For example, I'm to edit sendmail.cf. There are several lines followed by
Code: 
>>>>>>> 10.1-RELEASE

<<<<<<< current version
VERSIONID($FreeBSD: release/10.0.0/etc/sendmail/freebsd.mc ..................
=======
...more stuff....
>>>>>>> 10.1-RELEASE

<<<<<<< current version

I believe that I am to delete the lines between <<< current version and >>> 10.1-RELEASE. Would that be correct?

I would post the whole thing but, for some reason I can't get vi to copy to the clipboard to paste it here. (I'm such a mess.)
 
drhowarddrfine said:
I believe that I am to delete the lines between <<< current version and >>> 10.1-RELEASE. Would that be correct?
Click to expand...
Ehm, I’m not an expert, but I believe you have to delete the lines between <<< current version and the ======= divider, and keep (or merge from the previous section) the content between the divider and the >>> 10.1-RELEASE line, also deleting this last one.
 
Do I keep the 10.1-RELEASE line and the current version lines? Or do I delete those lines, too? I know I'm in vi but I don't know if merge is looking for those or not.

Which brings me to another question. Is this output just showing the conflict and I need to edit a different file?
 
You can change the editor used for the merging by setting the EDITOR environment variable, for example export EDITOR=emacs if you're using a Bourne shell. If you are using sudo(8) to elevate privileges you have to add this to sudoers(5) to keep the variable in the superuser environment:
Code: 
Defaults env_keep += "EDITOR"
 
You must log in or register to reply here.
Back
Top