Add docker-git as conflicting package

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7438350c67b0..011d82a591c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,7 @@ pkgbase = docker-bin
 	optdepends = btrfs-progs: btrfs backend support
 	optdepends = lxc: lxc backend support
 	conflicts = docker
+	conflicts = docker-git
 	options = !strip
 	source = https://get.docker.com/builds/Linux/x86_64/docker-1.13.0.tgz
 	source = https://github.com/docker/docker/archive/v1.13.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index e669e8f2b257..a6477b0a5496 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc='Pack, ship and run any application as a lightweight container, using of
 arch=('x86_64')
 url='https://www.docker.com/'
 license=('Apache')
-conflicts=('docker')
+conflicts=('docker' 'docker-git')
 depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
 makedepends=('go-md2man')
 optdepends=('btrfs-progs: btrfs backend support'