From bd8c49eebb032bee3e0bf03c7d0917c1448c7061 Mon Sep 17 00:00:00 2001
From: Aleksandr Lesnenko <alxnddr@users.noreply.github.com>
Date: Wed, 31 Aug 2022 18:07:50 +0400
Subject: [PATCH] fix backports auto-approve (#25137)
---
.github/workflows/auto-backport.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/auto-backport.yml b/.github/workflows/auto-backport.yml
index a363f7e8abf..dfd68c67a0d 100644
--- a/.github/workflows/auto-backport.yml
+++ b/.github/workflows/auto-backport.yml
@@ -49,6 +49,8 @@ jobs:
exit 0
fi
+ echo "::set-output name=has-conflicts::false"
+
git checkout master
git push -u origin ${BACKPORT_BRANCH}
--
GitLab