diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml index 8c67fdfc9..534d138e1 100644 --- a/.github/actions/get-merge-commit/action.yml +++ b/.github/actions/get-merge-commit/action.yml @@ -98,6 +98,6 @@ runs: if [[ "$mergeable" == "true" ]]; then echo "merge-commit-sha=$(jq -r .merge_commit_sha <<<"$prInfo")" >> "$GITHUB_OUTPUT" else - echo "# 🚨 The PR has a merge conflict!" >>> "$GITHUB_STEP_SUMMARY" + echo "# 🚨 The PR has a merge conflict!" >> "$GITHUB_STEP_SUMMARY" exit 2 fi