Skip to content

Conversation

github-actions[bot]
Copy link

⚠️ Cherry-pick Conflicts - Manual Resolution Required

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:

  1. Check out this branch locally: git fetch origin && git checkout cherry-pick-pr-2072-17821316762-conflicts
  2. Resolve conflicts in the affected files
  3. Test your changes thoroughly
  4. Commit your resolution: git add . && git commit
  5. Push changes: git push origin cherry-pick-pr-2072-17821316762-conflicts
  6. Mark this PR as ready for review

📁 Files with conflicts:

.pre-commit-config.yaml 

Original PR Link: #2072
Original Commit: 09b2586

Original PR Description

updates:

Copy link

coderabbitai bot commented Sep 18, 2025

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

D/S test tox -e verify-bugs-are-open failed: cnv-tests-tox-executor/16875

@rnetser rnetser closed this Sep 28, 2025
@rnetser rnetser deleted the cherry-pick-pr-2072-17821316762-conflicts branch September 29, 2025 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants