specify how to reconcile divergent bases

1 files changed, 2 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d8d6ea982917..6945245ff1ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: chrhasse <hasse dot christopher at gmail dot com>
 pkgname='alacritty-sixel-git'
 _pkgname="alacritty"
-pkgver=0.12.0.2074.ga9335fcb
+pkgver=0.12.0.2076.g15ff7565
 pkgrel=1
 epoch=1
 arch=('x86_64' 'i686')
@@ -20,6 +20,7 @@ prepare() {
   cd "$_pkgname/alacritty"
   git config user.name "user"
   git config user.email "user@domain.fake"
+  git config pull.rebase false
   git pull -X theirs origin pull/4763/head --no-edit
 }