search

openshift-kni / debug-tools

debug and troubleshooting tools to check CNF workload configuration - unsupported
Apache License 2.0
0 stars 10 forks source link

update aliases 20230109 #72

Closed ffromani closed 1 year ago

ffromani commented 1 year ago

update aliases

ffromani commented 1 year ago

/cherry-pick release-4.10 /cherry-pick release-4.9 /cherry-pick release-4.8

openshift-cherrypick-robot commented 1 year ago

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

In response to [this](https://github.com/openshift-kni/debug-tools/pull/72#issuecomment-1375302263): >/cherry-pick release-4.10 >/cherry-pick release-4.9 >/cherry-pick release-4.8 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ffromani, MarSik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift-kni/debug-tools/blob/main/OWNERS)~~ [MarSik] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 1 year ago

@ffromani: #72 failed to apply on top of branch "release-4.10":

Applying: update aliases 20230109
Using index info to reconstruct a base tree...
M   OWNERS_ALIASES
Falling back to patching base and 3-way merge...
Auto-merging OWNERS_ALIASES
CONFLICT (content): Merge conflict in OWNERS_ALIASES
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update aliases 20230109
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift-kni/debug-tools/pull/72#issuecomment-1375302263): >/cherry-pick release-4.10 >/cherry-pick release-4.9 >/cherry-pick release-4.8 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 1 year ago

@ffromani: #72 failed to apply on top of branch "release-4.9":

Applying: update aliases 20230109
Using index info to reconstruct a base tree...
M   OWNERS_ALIASES
Falling back to patching base and 3-way merge...
Auto-merging OWNERS_ALIASES
CONFLICT (content): Merge conflict in OWNERS_ALIASES
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update aliases 20230109
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift-kni/debug-tools/pull/72#issuecomment-1375302263): >/cherry-pick release-4.10 >/cherry-pick release-4.9 >/cherry-pick release-4.8 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 1 year ago

@ffromani: #72 failed to apply on top of branch "release-4.8":

Applying: update aliases 20230109
Using index info to reconstruct a base tree...
M   OWNERS_ALIASES
Falling back to patching base and 3-way merge...
Auto-merging OWNERS_ALIASES
CONFLICT (content): Merge conflict in OWNERS_ALIASES
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update aliases 20230109
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift-kni/debug-tools/pull/72#issuecomment-1375302263): >/cherry-pick release-4.10 >/cherry-pick release-4.9 >/cherry-pick release-4.8 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ffromani commented 1 year ago

manual backport it is!