Skip to content

Conversation

@jmagak
Copy link
Member

@jmagak jmagak commented Nov 27, 2024

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

Version(s): 1.4

Add the relevant labels to the Pull Request.
Issue:
https://issues.redhat.com/browse/RHIDP-4699
Related PR: #661

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 27, 2024

@jmagak jmagak marked this pull request as draft November 27, 2024 15:30
@josephca
Copy link
Member

/lgtm

@jmagak jmagak added Technical review done ⛅ Any procedure has been succesfully tested Ready to merge 💂 and removed Technical review needed 🔩 Test all the procedures labels Nov 28, 2024
@themr0c themr0c marked this pull request as ready for review November 28, 2024 08:05
@themr0c themr0c merged commit 1328b33 into redhat-developer:main Nov 28, 2024
4 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

Oh! The PR got merged as soon as I removed the draft state. Auto-merge was enabled?

@openshift-cherrypick-robot
Copy link
Contributor

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

Applying: Add supported platform
Using index info to reconstruct a base tree...
M	artifacts/attributes.adoc
A	modules/about/ref-supported-platforms.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/about/ref-supported-platforms.adoc deleted in HEAD and modified in Add supported platform. Version Add supported platform of modules/about/ref-supported-platforms.adoc left in tree.
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 Add supported platform

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: #743 failed to apply on top of branch "release-1.4":

Applying: Add supported platform
Using index info to reconstruct a base tree...
M	artifacts/attributes.adoc
A	modules/about/ref-supported-platforms.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/about/ref-supported-platforms.adoc deleted in HEAD and modified in Add supported platform. Version Add supported platform of modules/about/ref-supported-platforms.adoc left in tree.
Auto-merging 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 Add supported platform

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 the release-1.3 and release 1.4 branches?

@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: #745

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

release-1.4 is OK now

@pabel-rh can you manually cherry-pick to the release-1.3 branches this and #661 (in one single PR)?

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