2 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 113929a3ed6c..bf5bc056cc73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = picom-tryone-git
 	pkgdesc = tryone144's picom fork with dual_kawase blur, an X compositor (fork of compton)
-	pkgver = 1389_Next.108.g8877844_2020.04.09
+	pkgver = 1417_Next.136.g7a3137b_2020.04.11
 	pkgrel = 1
 	url = https://github.com/tryone144/picom/tree/feature/dual_kawase
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 2266d497902b..f24de31163c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=picom-tryone-git
 _gitname=picom
-pkgver=1389_Next.108.g8877844_2020.04.09
+pkgver=1417_Next.136.g7a3137b_2020.04.11
 pkgrel=1
 pkgdesc="tryone144's picom fork with dual_kawase blur, an X compositor (fork of compton)"
 arch=(i686 x86_64)
@@ -40,7 +40,11 @@ prepare() {
   git config --local user.email picom@makepkg.aur
   git rebase --abort 2>&1 >/dev/null || :
   git fetch https://github.com/yshui/picom.git next
-  git rebase FETCH_HEAD
+  git -c commit.gpgsign=false rebase \
+    --fork-point \
+    --rerere-autoupdate \
+    --strategy-option=ours \
+    FETCH_HEAD
 }
 
 build() {