From f028043448bbc197acd11255bd5085ca8bad161f Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Mon, 6 Jul 2020 22:05:18 +0800
Subject: [PATCH] Update r2s_lean_minimal.yml

---
 .github/workflows/r2s_lean_minimal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml
index d6b3882..e150454 100644
--- a/.github/workflows/r2s_lean_minimal.yml
+++ b/.github/workflows/r2s_lean_minimal.yml
@@ -129,7 +129,7 @@ jobs:
           git checkout upstream/master -b tmp
           #git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c
           git checkout origin/master-v19.07.1
-          git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
+          git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs || true
           git add target/linux/sunxi/image/cortex-a53.mk
           git rebase --continue
           #rm -rf package/kernel/mt76/Makefile package/network/services/hostapd package/kernel/mac80211