Skip to content

Commit

Permalink
Merge pull request #40540 from software-mansion-labs/fix-e2e-merge
Browse files Browse the repository at this point in the history
[CI/CD] Fix merging on E2E Performance Tests
  • Loading branch information
danieldoglas authored Apr 19, 2024
2 parents bec1c8e + 1ef3191 commit 305f12c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/e2ePerformanceTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
id: getMergeCommitShaIfUnmergedPR
run: |
git merge --allow-unrelated-histories --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
git merge --allow-unrelated-histories -X ours --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
git checkout ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
env:
GITHUB_TOKEN: ${{ github.token }}
Expand Down

0 comments on commit 305f12c

Please sign in to comment.