Skip to content

Commit

Permalink
server: fix testmerge worker action 9
Browse files Browse the repository at this point in the history
  • Loading branch information
Bizzonium committed Jul 28, 2024
1 parent a231405 commit 3dd4410
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/testmerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
PR_TITLE=$(echo "$PR_DETAIL" | jq -r '.title')
echo "Preparing $PR_TITLE (#$PR_NUMBER)"
git fetch origin pull/$PR_NUMBER/head:pr-$PR_number
git fetch origin pull/$PR_NUMBER/head:pr-$PR_NUMBER
# Check for merge conflicts
git merge --no-commit --no-ff pr-$PR_NUMBER || true
Expand Down

0 comments on commit 3dd4410

Please sign in to comment.