Update prepare-branch.sh#448
Open
malteprang wants to merge 1 commit intoalpinelinux:masterfrom
Open
Conversation
Added a forced checkout so untracked .github files don't let the checkout fail
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
5 days ago the file .github/ISSUE_TEMPLATE/config.yml was added to the repo.
Since then our automatic pipelines failed due to the following issue:
=> After 'git push -f origin v3.18', add the above to:
=> https://github.com/docker-library/official-images/blob/master/library/alpine
error: The following untracked working tree files would be overwritten by checkout:
.github/ISSUE_TEMPLATE/config.yml
Please move or remove them before you switch branches.
Aborting
Adding the .github directory to .gitignore didn't helped so I added a forced checkout so untracked .github files don't let the checkout fail. Our pipelines run successful with the forked script.