From 0e81721c99d1a07310b6623b8a4d9100447f80f8 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen.haas@lakedrops.com> Date: Mon, 27 Feb 2023 10:44:03 +0100 Subject: [PATCH] Improving merge script --- bin/merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/merge b/bin/merge index 4e7067e..81be2d2 100755 --- a/bin/merge +++ b/bin/merge @@ -32,6 +32,6 @@ rm /tmp/glab.log || true glab mr create --fill --yes --source-branch ${SOURCEBRANCH} --target-branch ${TARGETBRANCH} --title "$TITLE" > /tmp/glab.log EC=0 grep "Failed to create merge request." /tmp/glab.log || EC=$? -if [[ $EC -neq 0 ]]; then glab mr create --recover; fi +if [[ $EC -ne 0 ]]; then glab mr create --recover; fi sleep 5 glab mr merge --yes ${SOURCEBRANCH} -- GitLab