Cannot merge files when upgrading from 13.0 to 13.1 FreeBSD reddit / freebsd ---------------------------------------------------------------------- Puzzleheaded_Bass_59 · 2022-08-17 00:40 I got a message saying to manually merge this while updating. After this command. ‘freebsd-update upgrade -r 13.1-RELEASE’ Would anyone be able to help me with this issue please thanks ---------------------------------------------------------------------- KookyWait · 2022-08-17 00:51 It's because you added a user to the video group. The addition of the realtime and idletime groups/lines is what you need to pick up from the merge. ---------------------------------------------------------------------- bas · 2022-08-17 01:01 Resolve the merge conflicts (<<<…, >>>…) manually. Those sections show you your changes, and the incoming changes from 13.1. Presumably, you want to keep your “video” line, and 13.1’s realtime and idletime lines. Delete the lines beginning with ‘<<…’, ‘===…’, and ‘>>>…’ when you’re done. ---------------------------------------------------------------------- Puzzleheaded_Bass_59 · 2022-08-17 04:08 Hi, thanks for the reply. So, what you are saying is that delete content below <<<.. and above >>>.. thanks & Best Regards regards. ---------------------------------------------------------------------- Puzzleheaded_Bass_59 · 2022-08-17 04:17 Yes. I think so too. So, will it happen again if I add user to video group after the update and update again in a future time please? Thanks & Best Regards ---------------------------------------------------------------------- bas · 2022-08-17 04:32 Not quite. The ‘===…’ delineates two conflicting sections (you made changes, 13.1 made changes). You have to resolve the changes and decide what the file should look like afterward. ---------------------------------------------------------------------- ByronEster · 2022-08-17 04:35 I don't think so. I think it's a merge conflict partly because of the addition of the new lines ---------------------------------------------------------------------- Willing_Birthday_451 · 2022-08-17 06:40 You need to resolve the merge conflict. Read about diff. ---------------------------------------------------------------------- Puzzleheaded_Bass_59 · 2022-08-17 08:38 The computer went into time out at login prompt would you be able let me know where is this file located please thanks & best regards ---------------------------------------------------------------------- bas · 2022-08-21 16:26 Looks like /etc/group ---------------------------------------------------------------------- grahamperrin · 2022-08-29 08:27 > to manually merge this while updating. There should be an answer under , but I can not see one. ---------------------------------------------------------------------- 12Darius21 · 2022-08-29 08:37 This is the result of a merge conflict. diff3 is used to compare 3 files - the common ancestor, the current version (that you edited) and the version that is now in FreeBSD. Unfortunately, the diff3 man page is very light on, there is more information here: https://www.gnu.org/software/diffutils/manual/diffutils.html#Marking- Conflicts ---------------------------------------------------------------------- [deleted] · 2022-08-30 06:19 [deleted] ---------------------------------------------------------------------- Puzzleheaded_Bass_59 · 2022-08-30 06:20 Hi, Thanks for the information. ---------------------------------------------------------------------- Puzzleheaded_Bass_59 · 2022-09-02 03:46 Hi, I just reinstalled it with adding user only to wheel group. On another not would be able to let me know how to run Firefox on a chroot linux jail please. The question: https://www.reddit.com/r/freebsd/comments/wya6h0/run_fir efox_within_a_chroot_jail/?utm_source=share&utm_medium=ios_app&utm_nam e=iossmf Thanks & Best Regards Schroter Michael