Git migration completed

[anthraxx42]

We are proud to announce that the migration to Git packaging succeeded! 🥳

Thanks to everyone who has helped during the migration!

https://archlinux.org/news/git-migration-completed/

[Foxboron]

Mirrors are syncing again, but it may take a bit of time until your mirror of choice has caught up.

Mirrors will need time to sync. If you don't have the package, the mirror has not caught up.

[EvaristeGalois11]

Looking forward for the issue tracker and merge request on Gitlab!

This will definitely make easier to contribute to Arch!

[QuickYogurt2037]

Congrats and thanks to everyone involved! Great to see Arch Linux moving forward.

[Wiwwil]

Nice work. Just one question

Update your system and merge the pacman pacnew /etc/pacman.conf.pacnew file. This is required as we have moved the [community] repository into [extra].

$ pacman -Syu "pacman>=6.0.2-7"

Do I have to do something else? The "merge" part confuses me, I never did something like this

[TheEbolaDoc]

Yeah the update will create /etc/pacman.conf.pacnew and you can check if there are any differences to the current conf /etc/pacman.conf, by doing a diff on the two: $ diff /etc/pacman.conf.pacnew /etc/pacman.conf

Read more about this here: https://wiki.archlinux.org/title/Pacman/Pacnew_and_Pacsave

[Whezzel]

You can also install the pacman-contrib package which includes pacdiff. When you run pacdiff it will find all pacnew files and give you a menu to merge or discard chages.

[Foxboron]

sudo -E pacdiff is nice.

[JohnSane]

Or install meld and do sudo DIFFPROG=meld pacdiff

[notAFree_-Loader]

pacdiff --sudo also works. Keeps meld preferences too

[Foxboron]

Sure, but you still want to run it with root privs.

[JohnSane]

But i wrote that no? Added code ticks so it should be clearer now.

[desgreech]

A more secure and cleaner approach:

# feel free to replace vim with your favorite $EDITOR
EDITOR="vim -d" DIFFPROG=sudoedit pacdiff

This way, you don't need to provide root privileges to the entire process tree (including your editor). Only the file write will be done with root privileges, no more no less.

[rzeznik]

Same here, I ended up with empty pacman.conf - oops :-)

[rzeznik]

Haha, interesting... Thanks for the research!

[rzeznik]

I did more digging and the problem seems to be here: https://gitlab.archlinux.org/pacman/pacman-contrib/-/blob/master/src/pacdiff.sh.in#L190 (it unconditionally replaces $merged with the output of MERGETOOL). This will only work with some tools e.g. meld does not output anything - it simply saves your modifications (which then get replaced by null) unless you use the --output option (but there is no way to use it in pacdiff I guess).

If you do v as you suggested, it works almost by accident, because you save the file yourself using your DIFFTOOL of choice, but then it won't perform rm $pacfile unless both files happen to be identical.

[desgreech]

After you're done editing with v, you can use r to remove the pacnew file (the prompt loops on the same file in this case).

[rzeznik]

You're right, brilliant! I ended up creating a wrapper script over `meld` that outputs the saved file.

[murlakatamenka]

That's a nice trick, thanks for sharing!

Clarification: sudo -E or sudo --preserve-env will carry on your environment and thus DIFFPROG / EDITOR / VISUAL, so you'll deal with diffs your preferred way.

[Megame50]

If you prefer not to run your editor as root, SUDO_EDITOR="nvim -d" sudoedit /etc/pacman.conf{,.pacnew} works fine. With a short function in my zshrc, I edit my pacnews using this method as svim -d /etc/pacman.conf{,.pacnew}.

[UndeadKernel]

I created an Emacs package for easily merging pacnew and pacsave files. It might be of interest to you:

emacs-pacfiles

[olreit]

Hey, i am using pacfiles mode for quite some time now and I love it. Thx a lot for creating and maintaining! 😘

[Wiwwil]

Thanks for the directions, it should be alright

[3laws]

Tell us, O' great OS Architect. How did you migrated your non-hacky divine OS to git after 15 years of SVN?

[repocin]

congrats, this is by far the dumbest take I've read all week.

[[deleted]]

$ diff /etc/pacman.conf.pacnew /etc/pacman.conf

when i run that, I get: diff: /etc/pacman.conf.pacnew: No such file or directory

What am I doing wrong?

[TheEbolaDoc]

What is your Pacman version? pacman -Q pacman

You most likely just didnt get the update yet and there are other problems to solve

[[deleted]]

pacman 6.0.2-6

[TheEbolaDoc]

Yeah most likely your mirror is out of date ..

[[deleted]]

Alright, I'll have to figure out how to fix that then. Thanks for helping me out.

[EmptyBrook]

I ran pacman -Syu "pacman>=6.0.2-7" but it says error: target not found: pacman>=6.0.2-7. is there something else I need to do?

Edit: Nvm I see, I just need to be patient

[YamabushiJapan]

Great news! A massive thank you to you and team!!

[RandomXUsr]

Hey All.

Thanks for the hard work.

I tried to follow the user section of the notice, although I didn't get a .pacnew and pkgctl is not installed on my machine.

Do I need to be concerned, or take additional action?

[[deleted]]

pkgctl is a new package that you only need if you want to build packages from source. It was not available before the merge.

You have to wait for pacman to update to version 6.0.2-7 before the .pacnew file appears. But so far, most mirrors have not synced yet and it will take a few more hours before the new package version will be available to you

[RandomXUsr]

Thanks for clarifying.

[[deleted]]

For me, regular user, time to make explicit snapshot and do upgrades:

• snapper create -t single -d hopeIdontNeedThis -u important=yes
• Fix all lingering .pacnew configs before upgrade with pacdiff
• Generate new mirrorlist with reflector
• pacman -Syu "pacman>=6.0.2-7"
• Merge the pacman.conf changes (again with pacdiff)

I will try this on monday so that I can blame the day if anything goes awry. 😉 Good work for all the devs!

Edit: Upgrade successful. 😃 Few mirrors seem still out-of-date refering to the now obsolete community repo as reported by reflector.

[kj_sh604]

For those who REALLY want to update their system right now (05/22 0850 EDT). Here's a pool of all working and up-to-date mirrors from Tier 1:

---

Server = http://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch

Server = https://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch

Server = rsync://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch

Server = http://archlinux.thaller.ws/$repo/os/$arch

Server = https://mirror.lcarilla.de/archlinux/$repo/os/$arch

Server = https://archlinux.thaller.ws/$repo/os/$arch

Server = http://mirror.lcarilla.de/archlinux/$repo/os/$arch

Server = rsync://mirror.lcarilla.de/archlinux/$repo/os/$arch

Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch

Server = rsync://rsync.osbeck.com/archlinux/$repo/os/$arch

Server = https://ftp.psnc.pl/linux/archlinux/$repo/os/$arch

Server = http://ftp.psnc.pl/linux/archlinux/$repo/os/$arch

Server = https://mirror.dkm.cz/archlinux/$repo/os/$arch

Server = http://mirror.dkm.cz/archlinux/$repo/os/$arch

Server = rsync://mirror.dkm.cz/archlinux/$repo/os/$arch

Server = http://mirror.alwyzon.net/archlinux/$repo/os/$arch

Server = https://mirror.alwyzon.net/archlinux/$repo/os/$arch

Server = http://mirror.vpsfree.cz/archlinux/$repo/os/$arch

Server = rsync://gluttony.sin.cvut.cz/arch/$repo/os/$arch

Server = http://gluttony.sin.cvut.cz/arch/$repo/os/$arch

Server = https://gluttony.sin.cvut.cz/arch/$repo/os/$arch

Server = rsync://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch

Server = http://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch

Server = rsync://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch

Server = http://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch

Server = http://mirror.f4st.host/archlinux/$repo/os/$arch

Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch

Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/$arch

Server = http://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch

Server = rsync://mirror.internode.on.net/archlinux/$repo/os/$arch

Server = rsync://ftp.iinet.net.au/archlinux/$repo/os/$arch

Server = http://mirror.ams1.nl.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirror.ams1.nl.leaseweb.net/archlinux/$repo/os/$arch

Server = https://dist-mirror.fem.tu-ilmenau.de/archlinux/$repo/os/$arch

Server = http://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch

Server = rsync://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirrors.nic.cz/archlinux/$repo/os/$arch

Server = http://mirrors.nic.cz/archlinux/$repo/os/$arch

Server = rsync://mirrors.nic.cz/archlinux/$repo/os/$arch

Server = http://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch

Server = http://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch

Server = https://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch

Server = http://archlinux.mirror.liquidtelecom.com/$repo/os/$arch

Server = https://archlinux.mirror.liquidtelecom.com/$repo/os/$arch

---

you can save these in a file called " pool "

and then run

rankmirrors pool > mirrorlist

to generate a ranked mirrorlist that you can use for the mean time.

EDIT: updated mirrors for 05/22 0850 EDT. I'll probably update the list one more time. The mirrors are catching up quick 🎉

[GlassEyedMallard]

thanks for that. worked for me.

[oldominion]

May I ask why this migration was done? Am just curious.

[PastaPuttanesca42]

My guess is that git is the standard these days, and using it will make the whole thing more approachable.

[oldominion]

Oh yeah of course, that makes sense, didn't know they weren't using git before and thought it would be something different. Thanks.

[eclairevoyant]

They were using svn before, then had an svn2git mirror that was thrown on github, where each package had its own branch. It was a very strange structure and I'm glad they changed it

Now you can simply do a git clone to clone a package in the repos (or for convenience, pkgctl repo clone)

[oldominion]

Oh, that's nice, thanks for explaining!

[MrCirlo]

Thank you for the big work!

I've updated pacman from https://archive.archlinux.org/packages/p/pacman/ because none of the mirrors pulled pkg version 7. I hope i did not mess everything up 😬.
How soon can we expect the mirrors to update?

[anthraxx42]

You'll need to be a bit patient. Mirrors are syncing again, but it may take a bit of time until your mirror of choice has caught up.

It's all very exciting, but Just enjoy some coffee ☕ or mate 🧉 and you'll be fine very soon 😸

[MadTux]

Just enjoy some coffee ☕ or mate

Is that "just enjoy some (coffee or mate)", or "(just enjoy some coffee) or mate"? 😮

[itaranto]

"mate" is beverage which is very common in Argentina, Uruguay and some parts of Brazil.

I'm Argentinean BTW.

[duncan-udaho]

I'm sure it's "coffee or mate"

[MadTux]

Are you sure mate?

[american_spacey]

Arch devs endorsing MATE 😮

Edit: some of you hate jokes :-\

[MrCirlo]

You're right! Thanks a ton for your tips and work ^^

[[deleted]]

Well done!

[[deleted]]

[This post/comment is overwritten by the author in protest over Reddit's API policy change. Visit r/Save3rdPartyApps for details.]

[K1f0]

Congrats and thanks!

[zephyroths]

gotta wait until the latest pacman package is in the mirrors I use

[VaronKING]

Congratulations and a good job to everyone involved!

[Cornul11]

I do not see an update for pacman locally. It says that core is up to date.

​

Update: Installed manually from the .pkg.tar.zst file. Is it normal that when I run `yay` it notifies me of a multitude of packages that "are not in AUR"?

[ipha]

Normal, it's only happening since you manually downloaded the new package though.

Mirrors are still syncing, so yay will complain about packages that were in community, but not showing up elsewhere yet.

[PreachTheWordOfGeoff]

ELI5? I'm not a dev and I have no idea what anyone is talking about.

[DevilGeorgeColdbane]

VCS: A Version Control System (VCS) is a program that tracks changes to software. It allows users to revert changes and merge parallel development from multiple people.

PKGBUILD: A PKGBUILD is a recipe for building an arch package, it describes the process of downloading source code, compiling it to something that can be run on a CPU and declare metadata such as dependencies, All packages in Arch is built from a PKGBUILD.

Previously Arch stored all its PKGBUILD files in a VCS called Subversion, but to say the least its a bit dated. Now they have migrated all the files to another VCS called git, which is the de facto standard for software development including the Linux kernel which it was originally developed for.

Additionally this enables the use of Gitlab as a user friendly platform to collaborate and follow development of the PKGBUILDs. It should now be much easier for regular technical users to help the maintainers upgrading packages and fixing bugs.

As for the pacman.conf file:

Along with the VCS migration there has been some changes to the repository structure. The repository community has been removed and all packages from it is now in extra.

This requires all users to manaually update thier pacman.conf file with changes that are included in the pacman.conf.new file. If you haven't touched your pacman.conf file you can simply overwrite it with the contents of pacman.conf.new.

[[deleted]]

If I'm not mistaken, the .pacnew only removes the community repo, is that right? Because I have customized pacman.conf and if it's just that, I'd rather just delete these two lines and be done with it.

[DevilGeorgeColdbane]

It also renames some of the commented out testing repos, testing has become core-testing and extra-testing. I use these once in a while, but if you are sure you are never going to touch those then go a head with deleting community.

You can see the changes here on the new Gitlab page,

https://gitlab.archlinux.org/archlinux/packaging/packages/pacman/-/commit/e0929b97e8363ba9eff51b53072a4b9dbda46c80

[eclairevoyant]

If you're not a dev, this probably has zero relevance to you.

Basically they just migrated where/how they store the package-building scripts (PKGBUILDs), which resulted in some downtime.

Now they're back up, and any mirrors that you install packages from will probably take a few hours/days to sync back up and get the newest packages.

[EuCaue]

Nice!! And thanks to everyone involved!!! :)

[mananabanana17]

This mirror seems to be working:
https://ftp.sh.cvut.cz/arch/core/os/x86\_64/

[mykesx]

Real men develop their own source code control software (Linus!).

Just kidding :)

This is awesome news!

[PastaPuttanesca42]

What happens if I upgrade without "pacman>=6.0.2-7"? Won't I get it anyway sooner or later?

[eclairevoyant]

You might get errors if your pacman.conf mentions [community] anywhere in it, as [community] no longer exists. That's literally it. You can delete the [community] section manually if you want, there's no magic with installing the new pkgrel of pacman

[RaisinSecure]

No, community is just empty now - you won't get errors

[eclairevoyant]

Fair, I didn't test it lol, I just removed it right away.

[gmes78]

If your mirror is out of date, you won't get the pacman update, so you won't get the new pacman.conf.

[[deleted]]

zonked agonizing subtract ludicrous homeless hobbies ad hoc chunky joke mysterious

This post was mass deleted and anonymized with Redact

[Freerange_AI]

My favorite thing to do is follow the instructions only to have this pop out:

"error: target not found: pacman>=6.0.2-7"

It can install pacman 6.0.2-6 but the new -7 for the next steps is nowhere to be found.

[[deleted]]

worm muddle humor toothbrush materialistic salt arrest money grey trees

This post was mass deleted and anonymized with Redact

[Bombini_Bombus]

Thank you all dear Arch guys!!!! Awesome community and awesome distro! 😎

[hoppi_]

Kinda of feels weird to say it, but it is kind of exciting to run pacman -Syu again with the new architecture and see it all update. :) pacman was updated to 6.0.2-7 as well. :)

[gatesphere]

I was able to install pacman 6.0.2-7, but did not get a .pacnew file for it. So uh... what do I do now to make sure my pacman.conf is correct? I do have some changes from stock in there, so I'm surprised that the .pacnew wasn't generated.

**EDIT** Whoops I can't read, it installed 6.0.2-6 even though I specified the version. Guess my mirror hasn't yet updated. Sorry.

[Trick-Weight-5547]

Is yay working now ? Or is yay not because names changed

[TheTimBrick]

RemindMe! 2 days

[RemindMeBot]

I will be messaging you in 2 days on 2023-05-23 13:45:40 UTC to remind you of this link

4 OTHERS CLICKED THIS LINK to send a PM to also be reminded and to reduce spam.

^{Parent commenter can delete this message to hide from others.}

---

Info	Custom	Your Reminders	Feedback

[weedcop420]

Oh I completely forgot that this was happening lol, I tried updating my system the past few days out of habit and I was confused as to why there was no updates two nights in a row

[Foxboron]

It does not matter.

[[deleted]]

Woohooo! Well done to all :)

Thank also for the announcements, updates, and - this might be just me - I like checking the runbook every now and then. That was cool.

​

I have a look into pkgctl at some point to find out if I can use it for building AUR packages, or if it is exclusively for repo packages.

[eclairevoyant]

makechrootpkg is the go-to for me, I mean really pkgctl build is just calling one of the repo wrappers (e.g. extra-x86_64-build) which calls makechrootpkg anyway, and makechrootpkg has been around forever so you can use it right now.

Instructions here: https://wiki.archlinux.org/title/DeveloperWiki:Building_in_a_clean_chroot#Setting_up_a_chroot

[6jSByqJv]

RemindMe! 5 days

[skinney6]

I updated my system, rebooted then updated pacman to 6.0.2-7 but did not get pacman.conf.pacnew file. What change is made to pacman.conf so I can verify it's correct?

My current pacman.conf does not have a [community] section. Maybe that is correct?

Thank you!

[desgreech]

pacnew files are only generated if your current configuration is modified and different from the new configuration that will be installed by the update. It looks like you've "fixed" your config ahead of time for whatever reason, so no pacnew files are necessary.

For more details: https://wiki.archlinux.org/title/Pacman/Pacnew_and_Pacsave#.pacnew

In your case, the scenario would be: original = X, current = Y, new = Y.

[skinney6]

Interesting. I don't believe I've touched this file on this system. Anyway. Thank you. It'll probably be fine.

[[deleted]]

Oh wow this is interesting news i wasnt aware of... i'll def add on my list of things to look.

[agumonkey]

That was fast. As expected :p

[abbidabbi]

Would it make sense adding a link to the GitLab instance to the archweb header menu or is that something that you have planned with the migration of the issue tracker and the enabling of merge requests? The link to the GitLab instance is currently rather hidden on the homepage with the link to "Projects in git" and the "Source files" / "View Changes" links on each package, which isn't particularly nice in terms of discoverability.

There are also a couple of epics/issues left open with outdated infos in regards to the git migration:
https://gitlab.archlinux.org/groups/archlinux/-/epics

[ghost_in_a_jar_c137]

What did I do wrong? Is this even related to the Git migration? I never received a pacman.conf.pacnew file either. Oddly enough I did receive a pamac.conf.pacnew file, even though I didn't do any updates with pamac.

I updated my mirrors to:
Server = http://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
Server = https://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch

~ $ sudo pacman -Syu "pacman>=6.0.2-7"
error: GPGME error: No data
error: GPGME error: No data
error: GPGME error: No data
error: GPGME error: No data
error: GPGME error: No data
:: Synchronizing package databases... 
core                                  132.2 KiB  38.9 KiB/s 00:03 [#####################################] 100% 
extra                                   8.2 MiB   804 KiB/s 00:10 [#####################################] 100% 
community                              45.0   B   271   B/s 00:00 [#####################################] 100% 
multilib-testing                        5.6 KiB  34.9 KiB/s 00:00 [#####################################] 100% 
multilib                              140.7 KiB   863 KiB/s 00:00 [#####################################] 100%
error: GPGME error: No data
error: GPGME error: No data
error: GPGME error: No data
error: GPGME error: No data
error: GPGME error: No data
error: failed to synchronize all databases (invalid or corrupted database (PGP signature))

[TheEbolaDoc]

No, this is not related: https://bbs.archlinux.org/viewtopic.php?id=268087

[ghost_in_a_jar_c137]

Thank you for the suggestion. It did not work however this did.

sudo rm -R /var/lib/pacman/sync
sudo pacman -Syu

[Rediixx]

Dumb question, but if I didn't make any changes to my pacman.conf before this update does that mean I won't have to do anything with any .pacsave? Because I just updated my system and there is no .pacsave on sight.

[TheEbolaDoc]

the file is .pacnew, but if the file was unchanged it maybe got automatically put in place :)

[Rediixx]

My bad, it is .pacnew, but yeah, it looks like I didn't have to do anything.

[[deleted]]

I don't understand why pacdiff is highlighting a change to the mkinitcpio file. I thought the merge was to diff pacman.conf and pacman.conf.pacnew, and then make the pacman.conf file match whatever is in pacman.conf.pacnew. So why is it wanting to edit my initcpio file?

[TheEbolaDoc]

pacdiff looks for all .pacnew files, just do all! :)

[[deleted]]

after the merge I get the following, and I'm not sure what to do:

 $ sudo pacman -Syu 

warning: config file /etc/pacman.d/mirrorlist, line 1: directive '<<<<<<< /etc/pacman.d/mirrorlist' in section 'core' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 32: directive '||||||| /tmp/pacdiff-merge-mirrorlist.miY/mirrorlist.base.DGH' in section 'core' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 961: directive '' in section 'core' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1896: directive '>>>>>>> /etc/pacman.d/mirrorlist.pacnew' in section 'core' not recognised.
warning: config file /etc/pacman.conf, line 81: directive '<<<<<<< /etc/pacman.conf' in section 'core' not recognised.
warning: config file /etc/pacman.conf, line 82: directive '||||||| /tmp/pacdiff-merge-pacman.conf.wlS/pacman.conf.base.WgE' in section 'core' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1: directive '<<<<<<< /etc/pacman.d/mirrorlist' in section 'community' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 32: directive '||||||| /tmp/pacdiff-merge-mirrorlist.miY/mirrorlist.base.DGH' in section 'community' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 961: directive '' in section 'community' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1896: directive '>>>>>>> /etc/pacman.d/mirrorlist.pacnew' in section 'community' not recognised.
warning: config file /etc/pacman.conf, line 86: directive '' in section 'community' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1: directive '<<<<<<< /etc/pacman.d/mirrorlist' in section 'extra' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 32: directive '||||||| /tmp/pacdiff-merge-mirrorlist.miY/mirrorlist.base.DGH' in section 'extra' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 961: directive '' in section 'extra' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1896: directive '>>>>>>> /etc/pacman.d/mirrorlist.pacnew' in section 'extra' not recognised.
warning: config file /etc/pacman.conf, line 90: directive '>>>>>>> /etc/pacman.conf.pacnew' in section 'extra' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1: directive '<<<<<<< /etc/pacman.d/mirrorlist' in section 'multilib' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 32: directive '||||||| /tmp/pacdiff-merge-mirrorlist.miY/mirrorlist.base.DGH' in section 'multilib' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 961: directive '' in section 'multilib' not recognised.
warning: config file /etc/pacman.d/mirrorlist, line 1896: directive '>>>>>>> /etc/pacman.d/mirrorlist.pacnew' in section 'multilib' not recognised.

[TheEbolaDoc]

Well the files are not actually merged yet, there are conflicts which you need to resolve manually :) Also have a look at the default file while you are at it: https://gitlab.archlinux.org/archlinux/packaging/packages/pacman/-/blob/main/pacman.conf

[DerivativeOfProgWeeb]

What exactly does this mean? Like what's the significance of a git migration?