Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #101086

/assign shdeshpa07

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 30, 2025
@openshift-ci
Copy link

openshift-ci bot commented Oct 30, 2025

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@shdeshpa07 shdeshpa07 merged commit f47c511 into openshift:enterprise-4.16 Oct 30, 2025
2 checks passed
@shdeshpa07
Copy link
Contributor

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link
Author

@shdeshpa07: #101410 failed to apply on top of branch "enterprise-4.15":

Applying: OADP-6353 Added role to mark DITA descriptions
Using index info to reconstruct a base tree...
M	backup_and_restore/application_backup_and_restore/oadp-advanced-topics.adoc
M	backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc
M	backup_and_restore/application_backup_and_restore/oadp-intro.adoc
M	modules/oadp-ibm-power-test-support.adoc
M	modules/oadp-ibm-z-test-support.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/oadp-ibm-z-test-support.adoc
CONFLICT (content): Merge conflict in modules/oadp-ibm-z-test-support.adoc
Auto-merging modules/oadp-ibm-power-test-support.adoc
CONFLICT (content): Merge conflict in modules/oadp-ibm-power-test-support.adoc
Auto-merging backup_and_restore/application_backup_and_restore/oadp-intro.adoc
Auto-merging backup_and_restore/application_backup_and_restore/oadp-features-plugins.adoc
Auto-merging backup_and_restore/application_backup_and_restore/oadp-advanced-topics.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OADP-6353 Added role to mark DITA descriptions

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants