Skip to content

Conversation

gabriel-rh
Copy link
Contributor

@gabriel-rh gabriel-rh commented Oct 15, 2025

Version(s):
4.15-

Issue:
OBSDOCS-2564

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 15, 2025
@ocpdocs-previewbot
Copy link

🤖 Wed Oct 15 17:00:18 - Prow CI generated the docs preview:

https://100549--ocpdocs-pr.netlify.app/

Copy link

openshift-ci bot commented Oct 15, 2025

@gabriel-rh: 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.

@gabriel-rh
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@gabriel-rh: once the present PR merges, I will cherry-pick it on top of enterprise-4.14 in a new PR and assign it to you.

In response to this:

/cherrypick enterprise-4.14

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.

@gabriel-rh gabriel-rh merged commit cd66a25 into openshift:enterprise-4.15 Oct 15, 2025
2 checks passed
@gabriel-rh
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@gabriel-rh: #100549 failed to apply on top of branch "enterprise-4.14":

Applying: OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO
Using index info to reconstruct a base tree...
A	observability/logging/logging-6.1/log6x-visual-6.1.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): observability/logging/logging-6.1/log6x-visual-6.1.adoc deleted in HEAD and modified in OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO. Version OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO of observability/logging/logging-6.1/log6x-visual-6.1.adoc left in tree.
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 OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO

In response to this:

/cherrypick enterprise-4.14

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.

@openshift-cherrypick-robot

@gabriel-rh: #100549 failed to apply on top of branch "enterprise-4.14":

Applying: OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO
Using index info to reconstruct a base tree...
A	observability/logging/logging-6.1/log6x-visual-6.1.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): observability/logging/logging-6.1/log6x-visual-6.1.adoc deleted in HEAD and modified in OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO. Version OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO of observability/logging/logging-6.1/log6x-visual-6.1.adoc left in tree.
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 OBSDOCS-2564-4.15-2 Fix logging docs xrefs to COO

In response to this:

/cherrypick enterprise-4.14

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants