From c8edecae93c3d7175ea7e31bc3e41ffbaa0846fe Mon Sep 17 00:00:00 2001
From: Dmitri Dolguikh <ddolguik@redhat.com>
Date: Tue, 27 Apr 2021 10:55:59 -0700
Subject: [PATCH] Don't fail automator's merge workflow if there's a merge
 conflict

Signed-off-by: Dmitri Dolguikh <ddolguik@redhat.com>
---
 tools/automator/automator.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/automator/automator.sh b/tools/automator/automator.sh
index 109e35335b4..b869c9864d8 100755
--- a/tools/automator/automator.sh
+++ b/tools/automator/automator.sh
@@ -254,8 +254,10 @@ merge() {
   local src_branch="${AUTOMATOR_SRC_BRANCH:-none}"
   fork_name="$src_branch-$branch-$modifier-$(hash "$title")"
   git remote add -f -t "$merge_branch" upstream "$merge_repository"
+  set +e # git return a non-zero exit code on merge failure, which fails the script
   git -c "user.name=$user" -c "user.email=$email" merge --no-ff -m "$title" --log upstream/"$merge_branch"
   local code=$?
+  set -e
   if [ "$code" -ne 0 ]; then
     export GITHUB_TOKEN="$token"
     local issue_exists