Skip to content

Conversation

@pabel-rh
Copy link
Member

@pabel-rh pabel-rh commented Nov 6, 2024

Fixing Pantheon error.
This PR is created to fix the cross-reference error used for the dynamic plugins in PR-679.

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 6, 2024

@Gerry-Forde Gerry-Forde merged commit 0666ddd into redhat-developer:release-1.3 Nov 7, 2024
2 checks passed
@Gerry-Forde
Copy link
Member

/cherrypick main

@openshift-cherrypick-robot
Copy link
Contributor

@Gerry-Forde: #680 failed to apply on top of branch "main":

Applying: rectified error in Pantheon
Using index info to reconstruct a base tree...
M	artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.adoc
M	artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc
Falling back to patching base and 3-way merge...
Auto-merging artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc
CONFLICT (content): Merge conflict in artifacts/rhdh-plugins-reference/tekton/tekton-plugin-readme.adoc
Auto-merging artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.adoc
CONFLICT (content): Merge conflict in artifacts/rhdh-plugins-reference/tekton/tekton-plugin-admin.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 rectified error in Pantheon

In response to this:

/cherrypick main

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.

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