Skip to content

Commit 7fff497

Browse files
Do not comment twice if backporting fails due to merge conflicts. (#15050)
1 parent 2fd9b39 commit 7fff497

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/backport-base.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ jobs:
152152
issue_number: pr_number,
153153
body: git_am_failed_body
154154
});
155-
throw new Error("Error: git am failed, most likely due to a merge conflict.", false);
155+
core.setFailed("Error: git am failed, most likely due to a merge conflict.");
156+
return;
156157
}
157158
else {
158159
// push the temp branch to the repository

0 commit comments

Comments
 (0)