Resolve conflict during update

hbsd

hbsd

Hi
I recently solved the problems I had with the update. To be honest I felt I might be wrong again so I thought I'd ask. Now which lines should I delete and which should I keep:

Code: 
<<<<<<< current version
# $FreeBSD$
#
root:$6$6I2iVQdanVhCajkI$8FG4D4oEJbghoYtUs0evif.eTTN4hu4eLuSzk2J4HcVLm8mNOU0azoAMMfmTt99FVgY
4UreKY.Jmki9HrtmbT1:0:0::0:0:Charlie &:/root:/bin/csh
root::0:0::0:0:Charlie &:/root:/bin/sh
=======
root::0:0::0:0:Charlie &:/root:/bin/sh
>>>>>>> 14.1-RELEASE
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin
/var/db/freebsd-update/merge/new//etc/master.passwd: unmodified: line 1


should I remove these lines?:
Code: 
<<<<<<< current version
# $FreeBSD$
#
root:$6$6I2iVQdanVhCajkI$8FG4D4oEJbghoYtUs0evif.eTTN4hu4eLuSzk2J4HcVLm8mNOU0azoAMMfmTt99FVgY
4UreKY.Jmki9HrtmbT1:0:0::0:0:Charlie &:/root:/bin/csh
root::0:0::0:0:Charlie &:/root:/bin/sh
=======
root::0:0::0:0:Charlie &:/root:/bin/sh
>>>>>>> 14.1-RELEASE

I would appreciate it if you could tell me the Vi keys for editing, because I worked with Vim years ago and I don't remember exactly.
Thanks.
 
Remove red, keep green.

Rich (BB code): 
<<<<<<< current version
# $FreeBSD$
#
root:$6$6I2iVQdanVhCajkI$8FG4D4oEJbghoYtUs0evif.eTTN4hu4eLuSzk2J4HcVLm8mNOU0azoAMMfmTt99FVgY
4UreKY.Jmki9HrtmbT1:0:0::0:0:Charlie &:/root:/bin/csh
root::0:0::0:0:Charlie &:/root:/bin/sh
=======
root::0:0::0:0:Charlie &:/root:/bin/sh
>>>>>>> 14.1-RELEASE
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin

hbsd said:
I would appreciate it if you could tell me the Vi keys for editing, because I worked with Vim years ago and I don't remember exactly.
Click to expand...
dd - delete line
Esc - command mode
:wq - write, quit
:q! - quit without saving

Or use easy editor ee(1).
 
T-Daemon said:
Remove red, keep green.

Rich (BB code): 
<<<<<<< current version
# $FreeBSD$
#
root:$6$6I2iVQdanVhCajkI$8FG4D4oEJbghoYtUs0evif.eTTN4hu4eLuSzk2J4HcVLm8mNOU0azoAMMfmTt99FVgY
4UreKY.Jmki9HrtmbT1:0:0::0:0:Charlie &:/root:/bin/csh
root::0:0::0:0:Charlie &:/root:/bin/sh
=======
root::0:0::0:0:Charlie &:/root:/bin/sh
>>>>>>> 14.1-RELEASE
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin


dd - delete line
Esc - command mode
:wq - write, quit
:q! - quit without saving

Or use easy editor ee(1).
Click to expand...
ُThank you.
 
T-Daemon said:
Remove red, keep green.

Rich (BB code): 
<<<<<<< current version
# $FreeBSD$
#
root:$6$6I2iVQdanVhCajkI$8FG4D4oEJbghoYtUs0evif.eTTN4hu4eLuSzk2J4HcVLm8mNOU0azoAMMfmTt99FVgY
4UreKY.Jmki9HrtmbT1:0:0::0:0:Charlie &:/root:/bin/csh
root::0:0::0:0:Charlie &:/root:/bin/sh
=======
root::0:0::0:0:Charlie &:/root:/bin/sh
>>>>>>> 14.1-RELEASE
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin


dd - delete line
Esc - command mode
:wq - write, quit
:q! - quit without saving

Or use easy editor ee(1).
Click to expand...
2025-02-01-234510_1024x768_scrot.png


I'm really embarrassed by this stupid problem. I just edited the file correctly and exited with this key. I still see this text:
The following file could not be merged automatically: /etc/passwdPress Enter to edit this file in vi and resolve the conflictsmanually...
When I exit with control + C and even reboot the system, the upgrade process does not continue. I'm using this page to help me do this:

FreeBSD 14.1-RELEASE Installation Instructions

I've done this a few times before, but this time it just won't work.
 
# freebsd-update fetch
# /usr/sbin/freebsd-update fetch
# freebsd-update install
# freebsd-update upgrade -r 14.1-RELEASE
# freebsd-update install

2025-02-02-002415_1024x768_scrot.png


I did it again! and nothing. I can't upgrade to FreeBSD 14.1
 
You must log in or register to reply here.
Back
Top