Skip to content

Commit 7a44a9d

Browse files
Copilothenrymercer
andcommitted
Fix Rebuild Action workflow by adding --no-edit flag to git merge --continue
Co-authored-by: henrymercer <14129055+henrymercer@users.noreply.github.com>
1 parent e2ac371 commit 7a44a9d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/rebuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
# Otherwise, just commit the changes.
112112
if git rev-parse --verify MERGE_HEAD >/dev/null 2>&1; then
113113
echo "In progress merge detected, finishing it up."
114-
git merge --continue
114+
git merge --continue --no-edit
115115
else
116116
echo "No in-progress merge detected, committing changes."
117117
git commit -m "Rebuild"

0 commit comments

Comments
 (0)