diff --git a/bin/merge b/bin/merge index 86104beb5586fe39b274c89bb80707801873da80..6053e317763f5ae216310c65f8b463b186c7ff1a 100755 --- a/bin/merge +++ b/bin/merge @@ -28,10 +28,13 @@ if [[ "$1" == "major" ]]; then fi sleep 2 -rm /tmp/glab.log || true +rm /tmp/glab.log >/dev/null 2>&1 || 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 -eq 0 ]]; then glab mr create --recover; fi +if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log; fi +EC=0 +grep "Failed to create merge request." /tmp/glab.log || EC=$? +if [[ $EC -eq 0 ]]; then exit 1; fi sleep 5 glab mr merge --yes ${SOURCEBRANCH}