Skip to content

Commit

Permalink
fix: adjust conditions in Check Merge Fast-Forward Only action
Browse files Browse the repository at this point in the history
  • Loading branch information
UdjinM6 committed Oct 23, 2024
1 parent d494339 commit b6d7af5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
git fetch origin master:master
git checkout master
if [ "${{ github.event_name }}" == "pull_request" ]; then
if [ "${{ github.event_name }}" == "pull_request"* ]; then
git merge --ff-only ${{ github.event.pull_request.head.sha }}
else
git merge --ff-only ${{ github.sha }}
Expand Down

0 comments on commit b6d7af5

Please sign in to comment.