Skip to content

Conversation

@deerskindoll
Copy link
Contributor

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

Version(s):

main, 1.6, 1.7, 1.7.1,1.7.2, 1.8

Issue:

https://issues.redhat.com/browse/RHDHBUGS-2134

Preview:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Oct 23, 2025

@themr0c
Copy link
Member

themr0c commented Nov 10, 2025

/cherry-pick release-1.8

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

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.

@themr0c
Copy link
Member

themr0c commented Nov 10, 2025

/cherry-pick release-1.7

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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.

@themr0c
Copy link
Member

themr0c commented Nov 10, 2025

/cherry-pick release-1.6

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.6

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.

@themr0c themr0c merged commit dd951e8 into redhat-developer:main Nov 10, 2025
3 checks passed
@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: new pull request created: #1539

In response to this:

/cherry-pick release-1.7

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
Copy link
Contributor

@themr0c: #1456 failed to apply on top of branch "release-1.6":

Applying: updated attribute
Using index info to reconstruct a base tree...
M	artifacts/attributes.adoc
M	assemblies/assembly-install-rhdh-osd-gcp.adoc
M	modules/installation/proc-install-rhdh-osd-gcp-helm.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation/proc-install-rhdh-osd-gcp-helm.adoc
CONFLICT (content): Merge conflict in modules/installation/proc-install-rhdh-osd-gcp-helm.adoc
Auto-merging assemblies/assembly-install-rhdh-osd-gcp.adoc
Auto-merging artifacts/attributes.adoc
CONFLICT (content): Merge conflict in artifacts/attributes.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 attribute

In response to this:

/cherry-pick release-1.6

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
Copy link
Contributor

@themr0c: new pull request created: #1540

In response to this:

/cherry-pick release-1.8

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