Group merge output

check-spelling · Feb 21, 2024 · 8a08c48 · 8a08c48
1 parent c945e08
commit 8a08c48
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/merge b/merge
@@ -93,7 +93,10 @@ git fetch origin "$INPUT_HEAD_REF" ||
     report_failure "Can't get head_ref ($INPUT_HEAD_REF). Please contact support for $GITHUB_ACTION_REPOSITORY"
 
 GITHUB_HEAD_SHA=$(git rev-parse FETCH_HEAD)
-git merge -m "Merge $GITHUB_HEAD_SHA into $GITHUB_BASE_SHA" FETCH_HEAD ||
-    report_failure "Can't generate merge; there's probably a conflict. Resolve it to get workflow feedback."
+echo '::group::Merging'
+git merge -m "Merge $GITHUB_HEAD_SHA into $GITHUB_BASE_SHA" FETCH_HEAD &&
+    echo '::endgroup::' ||
+    report_failure "Can't generate merge; there's probably a conflict. Resolve it to get workflow feedback." &&
+    echo '::endgroup::'
 
 echo 'status=success' >> "$GITHUB_OUTPUT"