Ensure pull request branch name does not cause collisions #29
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a pull request is made by a user and they name their branch the same name as the target branch against which the pull request is being made, we run into a conflict, which causes the checkout to fail (see https://github.com/mezzio/mezzio-helpers/pull/7/checks?check_run_id=2393994090#step:3:9). To resolve this scenario, if we detect a pull_request, we can give the local branch name a prefix, `pull/`. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
weierophinney
force-pushed
the
hotfix/pull_request_branch
branch
from
54835e9 to
ac9c9d4
Compare
weierophinney
added a commit
to weierophinney/laminas-continuous-integration-action
that referenced
this pull request
Apr 20, 2021
… branch Similar to the issue reported in laminas/laminas-ci-matrix-action#29, we need to ensure that when we fetch the `$GITHUB_REF`, we fetch it into a branch that is named differently than the base branch to avoid collisions and errors. This patch accomplishes it by adding a `pull/` prefix to the pull request branch name. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
weierophinney
added a commit
to weierophinney/laminas-continuous-integration-action
that referenced
this pull request
Apr 20, 2021
… branch Similar to the issue reported in laminas/laminas-ci-matrix-action#29, we need to ensure that when we fetch the `$GITHUB_REF`, we fetch it into a branch that is named differently than the base branch to avoid collisions and errors. This patch accomplishes it by adding a `pull/` prefix to the pull request branch name. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
|
Fixes #24 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a pull request is made by a user and they name their branch the same name as the target branch against which the pull request is being made, we run into a conflict, which causes the checkout to fail (see https://github.com/mezzio/mezzio-helpers/pull/7/checks?check_run_id=2393994090#step:3:9).
To resolve this scenario, if we detect a pull_request, we can give the local branch name a prefix,
pull/.