File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -93,7 +93,10 @@ git fetch origin "$INPUT_HEAD_REF" ||
93
93
report_failure " Can't get head_ref ($INPUT_HEAD_REF ). Please contact support for $GITHUB_ACTION_REPOSITORY "
94
94
95
95
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::'
98
101
99
102
echo ' status=success' >> " $GITHUB_OUTPUT "
You can’t perform that action at this time.
0 commit comments