Click here to go back to the commit logs for git-secret-git.

Commit:

---

Hash: 12ae0c2cec32c18c7eaab33ebfb062c2fc6db801

Message: Updated conflicts

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index a5d3647..780f6bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,12 +3,14 @@ generated-by = makedeb-makepkg
 pkgbase = git-secret-git
 	pkgdesc = A bash-tool to store your private data inside a git repository
 	pkgver = 1.781.569f2e8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/sobolevn/git-secret
 	arch = any
 	license = MIT
 	depends = git
 	depends = gnupg
+	conflicts = git-secret
+	conflicts = git-secret-bin
 	source = git+https://github.com/sobolevn/git-secret.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c00fd2..85aa146 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname="git-secret-git"
 _gitname="git-secret"
 pkgver=1.781.569f2e8
-pkgrel=1
+pkgrel=2
 pkgdesc="A bash-tool to store your private data inside a git repository"
 arch=('any')
 url="https://github.com/sobolevn/git-secret"
@@ -14,6 +14,7 @@ license=('MIT')
 depends=('git' 'gnupg')
 source=("git+${url}.git")
 sha256sums=('SKIP')
+conflicts=("${_gitname}" "${_gitname}-bin")
 
 pkgver() {
   cd "${_gitname}"