Abacn commented on PR #27860:
URL: https://github.com/apache/beam/pull/27860#issuecomment-1669919261
I see, when there is a merge conflict, the ref `refs/pull/<PR number>/merge`
is then not available. One fix could be changing
```
with:
ref: refs/pull/${{ github.event.issue.number }}/merge
```
to
```
run: |
git checkout refs/pull/${{ github.event.issue.number }}/merge || git
checkout refs/pull/${{ github.event.issue.number }}/head
```
then it falls back to the pull request branch head if there is merge
conflicts, which is the current Jenkins behavior.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
