* It seems upstream finally made a decision on replaces and conflicts

  and implemented it in pacman 6.x. So, conflicts it is.

2 files changed, 6 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ebc197d4d06..13e6fd7c6522 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = emacs-git
 	pkgdesc = GNU Emacs. Development master branch.
-	pkgver = 30.0.50.162754
+	pkgver = 30.0.50.165017
 	pkgrel = 1
 	url = http://www.gnu.org/software/emacs/
 	install = emacs-git.install
@@ -29,7 +29,7 @@ pkgbase = emacs-git
 	depends = tree-sitter
 	depends = sqlite3
 	provides = emacs
-	replaces = emacs
+	conflicts = emacs
 	options = !strip
 	source = emacs-git::git+https://git.savannah.gnu.org/git/emacs.git
 	source = nemacs
diff --git a/PKGBUILD b/PKGBUILD
index 34e6efb6306d..e603b46ff04b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Pedro A. López-Valencia <https://aur.archlinux.org/users/vorbote>
+# Maintainer: Pedro A. López-Valencia <https://aur.archlinux.org/users/toropisco>
 
 ################################################################################
 # CAVEAT LECTOR: This PKGBUILD is highly opinionated. I give you
 #                enough rope to hang yourself, but by default it
 #                only enables the features I use.
 #
-#        TLDR: yaourt users, cry me a river.
+#        TLDR:   yaourt users, cry me a river.
 #
 #        Everyone else: do not update blindly this PKGBUILD. At least
 #        make sure to compare and understand the changes.
@@ -93,7 +93,7 @@ if [[ $CLI == "YES" ]] ; then
 else
   pkgname="emacs-git"
 fi
-pkgver=30.0.50.162754
+pkgver=30.0.50.165017
 pkgrel=1
 pkgdesc="GNU Emacs. Development master branch."
 arch=('x86_64')
@@ -103,7 +103,7 @@ depends_nox=('gnutls' 'libxml2' 'jansson')
 depends=("${depends_nox[@]}" 'harfbuzz')
 makedepends=('git')
 provides=('emacs')
-replaces=('emacs')
+conflicts=('emacs')
 source=("emacs-git::git+https://git.savannah.gnu.org/git/emacs.git"
         "nemacs")
 options=(!strip)