Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7a44a9d

Browse filesBrowse files
Copilothenrymercer
Copilot
and
henrymercer
committed
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
Copy full SHA for 7a44a9d

1 file changed

+1-1Lines changed: 1 addition & 1 deletion

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.github/workflows/rebuild.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/rebuild.yml
+1-1Lines 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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.