Skip to content

Commit 8a08c48

Browse files
committed
Group merge output
1 parent c945e08 commit 8a08c48

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

merge

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ git fetch origin "$INPUT_HEAD_REF" ||
9393
report_failure "Can't get head_ref ($INPUT_HEAD_REF). Please contact support for $GITHUB_ACTION_REPOSITORY"
9494

9595
GITHUB_HEAD_SHA=$(git rev-parse FETCH_HEAD)
96-
git merge -m "Merge $GITHUB_HEAD_SHA into $GITHUB_BASE_SHA" FETCH_HEAD ||
97-
report_failure "Can't generate merge; there's probably a conflict. Resolve it to get workflow feedback."
96+
echo '::group::Merging'
97+
git merge -m "Merge $GITHUB_HEAD_SHA into $GITHUB_BASE_SHA" FETCH_HEAD &&
98+
echo '::endgroup::' ||
99+
report_failure "Can't generate merge; there's probably a conflict. Resolve it to get workflow feedback." &&
100+
echo '::endgroup::'
98101

99102
echo 'status=success' >> "$GITHUB_OUTPUT"

0 commit comments

Comments
 (0)