diff --git a/bin/merge b/bin/merge index 4e7067e1b65e95840a19b61c24fcc6f06a65b2a6..81be2d29ab49ba962ad50d7a952eb814e7ccdf8b 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}