Skip to content

Commit

Permalink
Add --quiet
Browse files Browse the repository at this point in the history
  • Loading branch information
jaisnan committed Jul 26, 2024
1 parent 32dceba commit f32c6f2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/update-subtree.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Attempt subtree merge
working-directory: head
run: |
if ! git subtree merge --prefix=library subtree/library --squash; then
if ! git subtree merge --prefix=library subtree/library --squash --quiet; then
echo "Merge conflict detected. Attempting automatic resolution."
# Abort the failed merge
Expand Down

0 comments on commit f32c6f2

Please sign in to comment.