🚨 Cherry-pick Conflicts: [pre-commit.ci] pre-commit autoupdate (PR #2072) #2102
+5
−1
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.
The automatic cherry-pick of PR #2072 from
RedHatQE/openshift-virtualization-tests
resulted in conflicts.Original PR: [pre-commit.ci] pre-commit autoupdate
Author: @pre-commit-ci[bot]
Merge Commit: 09b2586
🔧 How to resolve:
git fetch origin && git checkout cherry-pick-pr-2072-17821316762-conflicts
git add . && git commit
git push origin cherry-pick-pr-2072-17821316762-conflicts
📁 Files with conflicts:
Original PR Link: #2072
Original Commit: 09b2586
Original PR Description
updates: