Skip to content

Commit

Permalink
Add --allow-unrelated-histories flag
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanCraft623 committed Jul 12, 2024
1 parent b206e95 commit 7d701db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Attempt to merge head into base
id: merge
run: |
git merge --no-ff --no-commit ${{ github.event.inputs.head }} || echo "Merge conflict detected" > conflict.txt
git merge --no-ff --no-commit ${{ github.event.inputs.head }} --allow-unrelated-histories || echo "Merge conflict detected" > conflict.txt
- name: Check for merge conflicts
id: check-conflict
Expand Down

0 comments on commit 7d701db

Please sign in to comment.