Do not comment twice if backporting fails due to merge conflicts. (#1…

…5050)
dotnet · Dec 4, 2024 · 7fff497 · 7fff497
1 parent 2fd9b39
commit 7fff497
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/backport-base.yml b/.github/workflows/backport-base.yml
@@ -152,7 +152,8 @@ jobs:
                 issue_number: pr_number,
                 body: git_am_failed_body
               });
-              throw new Error("Error: git am failed, most likely due to a merge conflict.", false);
+              core.setFailed("Error: git am failed, most likely due to a merge conflict.");
+              return;
             }
             else {
               // push the temp branch to the repository