Skip to content

Commit

Permalink
Remove continue-on-error for regular merge attempt
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
FHeilmann authored Feb 29, 2024
1 parent ea1318e commit 9a441ab
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .github/workflows/merge_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ jobs:
fetch-depth: 0
- name: Regular merge attempt
if: ${{ github.event.inputs.force == 'false' }}
continue-on-error: true
run: |
git checkout ${{ inputs.targetBranch }}
git merge main --ff-only
Expand Down

0 comments on commit 9a441ab

Please sign in to comment.