Skip to content

Conversation

@jmagak
Copy link
Member

@jmagak jmagak commented Nov 25, 2024

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

Version(s): 1.3, 1.4

Add the relevant labels to the Pull Request.
Issue: RHIDP-4996

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 25, 2024

@jmagak jmagak force-pushed the RHIDP-4996-Discover-Sizing-requirements-for-RHDH branch from 6af68b1 to 59d17fa Compare November 26, 2024 11:18
@jmagak jmagak added Technical review done ⛅ Any procedure has been succesfully tested Peer review done 📘 and removed Peer review needed 📖 Technical review needed 🔩 Test all the procedures labels Nov 26, 2024
@rm3l
Copy link
Member

rm3l commented Nov 27, 2024

@jmagak Is this PR still draft? Also, your branch needs to be updated to resolve the conflicts reported.

@jmagak jmagak force-pushed the RHIDP-4996-Discover-Sizing-requirements-for-RHDH branch from 59d17fa to d22e585 Compare November 27, 2024 12:19
@jmagak
Copy link
Member Author

jmagak commented Nov 27, 2024

@jmagak Is this PR still draft? Also, your branch needs to be updated to resolve the conflicts reported.
@rm3l , Yes, the PR is in draft as I am yet to get QE review; (I will request for it again). I have also resolved the conflicts.

@josephca
Copy link
Member

/lgtm

@themr0c
Copy link
Member

themr0c commented Nov 28, 2024

/cherry-pick release-1.3

@openshift-cherrypick-robot
Copy link
Contributor

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

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-ci openshift-ci bot removed the lgtm label Nov 28, 2024
@openshift-ci
Copy link

openshift-ci bot commented Nov 28, 2024

New changes are detected. LGTM label has been removed.

@themr0c
Copy link
Member

themr0c commented Nov 28, 2024

/chery-pick release-1.4

@themr0c themr0c marked this pull request as ready for review November 28, 2024 08:19
@themr0c themr0c merged commit 28fd302 into redhat-developer:main Nov 28, 2024
2 of 3 checks passed
@openshift-cherrypick-robot
Copy link
Contributor

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

Applying: Updates sizing requirements
Using index info to reconstruct a base tree...
M	assemblies/assembly-about-rhdh.adoc
Falling back to patching base and 3-way merge...
Auto-merging assemblies/assembly-about-rhdh.adoc
CONFLICT (content): Merge conflict in assemblies/assembly-about-rhdh.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 Updates sizing requirements

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.

@themr0c
Copy link
Member

themr0c commented Nov 28, 2024

/cherry-pick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: new pull request created: #748

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

@pabel-rh Can you manually cherry-pick to release-1.3?

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.

7 participants