Skip to content

Conversation

@pabel-rh
Copy link
Member

@pabel-rh pabel-rh commented Oct 22, 2024

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

Version(s): 1.2, 1.3

Issue: RHIDP-4090

Reviews:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Oct 22, 2024

@pabel-rh pabel-rh requested a review from jmagak October 23, 2024 05:55
Copy link
Member

@jmagak jmagak left a comment

Choose a reason for hiding this comment

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

LGTM, @pabel-rh

@hmanwani-rh
Copy link
Member

@pabel-rh Before merging this PR, we’ll need approval from John.
@johnmcollier Could you please review this minor PR and provide your approval so that we can proceed with the merge?

@hmanwani-rh
Copy link
Member

@pabel-rh Please rebase your branch

@hmanwani-rh hmanwani-rh merged commit 318be8f into redhat-developer:main Oct 29, 2024
2 checks passed
@hmanwani-rh
Copy link
Member

/cherry-pick release-1.3

@openshift-cherrypick-robot
Copy link
Contributor

@hmanwani-rh: new pull request created: #660

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.

@hmanwani-rh
Copy link
Member

/cherrypick 1.2.x

@openshift-cherrypick-robot
Copy link
Contributor

@hmanwani-rh: #651 failed to apply on top of branch "1.2.x":

Applying: fixed typo
Using index info to reconstruct a base tree...
A	modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc deleted in HEAD and modified in fixed typo. Version fixed typo of modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.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 fixed typo

In response to this:

/cherrypick 1.2.x

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.

jmagak pushed a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants