Skip to content

Conversation

@pabel-rh
Copy link
Member

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

Version(s): 1.3.x, 1.4.x, main
Issue: RHIDP-4924

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 27, 2024

Copy link
Collaborator

@pittar pittar left a comment

Choose a reason for hiding this comment

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

LGTM

@themr0c themr0c merged commit 35ad15b into redhat-developer:main Nov 28, 2024
3 checks passed
@themr0c
Copy link
Member

themr0c commented Nov 28, 2024

/cherry-pick release-1.3

@themr0c
Copy link
Member

themr0c commented Nov 28, 2024

/cherry-pick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: #736 failed to apply on top of branch "release-1.3":

Applying: Fixed the broken link
Applying: follow of another PR-708
Using index info to reconstruct a base tree...
M	modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
CONFLICT (content): Merge conflict in modules/getting-started/proc-customize-rhdh-tech-radar-page.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 0002 follow of another PR-708

In response to this:

/cherry-pick release-1.3

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: #744

In response to this:

/cherry-pick release-1.4

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 28, 2024

Cherry-pick to release-1.3 failed. Can you raise a PR manually @pabel-rh?

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.

5 participants