Skip to content

Conversation

@themr0c
Copy link
Member

@themr0c themr0c commented Oct 15, 2024

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

Version(s):

Issue:

Link to docs preview:

Reviews:

  • SME: @ mention assignee
  • QE: @ mention assignee
  • Docs review: @ mention assignee
  • Additional review: @mention assignee (by writer)

Additional information:

Signed-off-by: Fabrice Flore-Thébault <[email protected]>
@themr0c
Copy link
Member Author

themr0c commented Oct 15, 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.

@themr0c themr0c requested a review from hmanwani-rh October 15, 2024 12:48
@rhdh-bot
Copy link
Collaborator

@themr0c themr0c merged commit 2f39979 into redhat-developer:main Oct 15, 2024
2 checks passed
@themr0c themr0c deleted the fix-a-duplicate-id branch October 15, 2024 12:52
@openshift-cherrypick-robot
Copy link
Contributor

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

Applying: fix duplicate id
Using index info to reconstruct a base tree...
A	modules/authentication/proc-creating-a-custom-transformer-to-provision-users-from-rhsso-to-the-software-catalog.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/authentication/proc-creating-a-custom-transformer-to-provision-users-from-rhsso-to-the-software-catalog.adoc deleted in HEAD and modified in fix duplicate id. Version fix duplicate id of modules/authentication/proc-creating-a-custom-transformer-to-provision-users-from-rhsso-to-the-software-catalog.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 fix duplicate id

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.

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.

4 participants