Skip to content

Conversation

pabel-rh
Copy link
Member

@pabel-rh pabel-rh commented Jun 16, 2025

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s):
1.6.x only
Issue:
RHIDP-7803
Preview:
https://redhat-developer.github.io/red-hat-developers-documentation-rhdh/pr-1230/adoption-insights/

(NOTE: modularization changes for Adoption Insights is already done in another PR -> #1229

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Jun 16, 2025

@pabel-rh pabel-rh requested a review from linfraze June 16, 2025 15:26
Copy link
Member

@Gerry-Forde Gerry-Forde left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jun 20, 2025
@Gerry-Forde Gerry-Forde merged commit 7a0ce0a into redhat-developer:release-1.6 Jun 23, 2025
3 checks passed
@Gerry-Forde
Copy link
Member

/cherry-pick main

@openshift-cherrypick-robot
Copy link
Contributor

@Gerry-Forde: #1230 failed to apply on top of branch "main":

Applying: Updated structure
Using index info to reconstruct a base tree...
M	modules/observe/adoption-insights/proc-viewing-adoption-insights-card.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/observe/adoption-insights/proc-viewing-adoption-insights-card.adoc
CONFLICT (content): Merge conflict in modules/observe/adoption-insights/proc-viewing-adoption-insights-card.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 Updated structure

In response to this:

/cherry-pick main

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants