[Bug 185546] freebsd-update(8) can modify sshd and lock you out of your system

From: <bugzilla-noreply_at_freebsd.org>
Date: Wed, 14 Dec 2022 16:28:08 UTC 
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=185546

--- Comment #5 from Ed Maste <emaste@freebsd.org> ---
As comment #3 points out this conflict should have emitted a message and opened
an editor; this may not be particularly user-friendly, and also as comment #3
suggests we ought to check for "<<<<<<<" markers and refuse to continue until
they are addressed.

That said, this 3-way diff resolution is best addressed by having
freebsd-update use a tool (like etcmerge) rather than having built-in logic.

-- 
You are receiving this mail because:
You are the assignee for the bug.