Skip to content

Fixing a few double words #96323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2025
Merged

Conversation

bergerhoffer
Copy link
Contributor

Version(s):
4.12+

Issue:
N/A

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Submitting this so that I have something to merge as an example for showing new team members getting merge rights.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 18, 2025
Copy link

openshift-ci bot commented Jul 18, 2025

@bergerhoffer: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.20

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.19

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.18

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.17

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.16

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.15

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@bergerhoffer: new pull request created: #96404

In response to this:

/cherrypick enterprise-4.20

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-cherrypick-robot

@bergerhoffer: new pull request created: #96405

In response to this:

/cherrypick enterprise-4.19

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-cherrypick-robot

@bergerhoffer: #96323 failed to apply on top of branch "enterprise-4.18":

Applying: Fixing a few double words
.git/rebase-apply/patch:132: trailing whitespace.
After creating the `NodeNetworkConfigurationPolicy` CR, copy content from the NMState configuration file that was created during cluster installation into the NNCP CR. An incomplete NNCP CR file means that the network policy described in the file cannot get applied to nodes in the cluster. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	hardware_enablement/kmm-release-notes.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/external-secrets-test-coverage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/external-secrets-test-coverage.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/external-secrets-test-coverage.adoc left in tree.
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
Auto-merging hardware_enablement/kmm-release-notes.adoc
CONFLICT (content): Merge conflict in hardware_enablement/kmm-release-notes.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 Fixing a few double words

In response to this:

/cherrypick enterprise-4.18

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.

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@bergerhoffer: #96323 failed to apply on top of branch "enterprise-4.17":

Applying: Fixing a few double words
.git/rebase-apply/patch:132: trailing whitespace.
After creating the `NodeNetworkConfigurationPolicy` CR, copy content from the NMState configuration file that was created during cluster installation into the NNCP CR. An incomplete NNCP CR file means that the network policy described in the file cannot get applied to nodes in the cluster. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	hardware_enablement/kmm-release-notes.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/external-secrets-test-coverage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/external-secrets-test-coverage.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/external-secrets-test-coverage.adoc left in tree.
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (modify/delete): hardware_enablement/kmm-release-notes.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of hardware_enablement/kmm-release-notes.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 Fixing a few double words

In response to this:

/cherrypick enterprise-4.17

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-cherrypick-robot

@bergerhoffer: #96323 failed to apply on top of branch "enterprise-4.16":

Applying: Fixing a few double words
.git/rebase-apply/patch:132: trailing whitespace.
After creating the `NodeNetworkConfigurationPolicy` CR, copy content from the NMState configuration file that was created during cluster installation into the NNCP CR. An incomplete NNCP CR file means that the network policy described in the file cannot get applied to nodes in the cluster. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	hardware_enablement/kmm-release-notes.adoc
M	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/external-secrets-test-coverage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/external-secrets-test-coverage.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/external-secrets-test-coverage.adoc left in tree.
Auto-merging modules/creating-manifest-file-customized-br-ex-bridge.adoc
CONFLICT (modify/delete): hardware_enablement/kmm-release-notes.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of hardware_enablement/kmm-release-notes.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 Fixing a few double words

In response to this:

/cherrypick enterprise-4.16

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-cherrypick-robot

@bergerhoffer: #96323 failed to apply on top of branch "enterprise-4.15":

Applying: Fixing a few double words
.git/rebase-apply/patch:132: trailing whitespace.
After creating the `NodeNetworkConfigurationPolicy` CR, copy content from the NMState configuration file that was created during cluster installation into the NNCP CR. An incomplete NNCP CR file means that the network policy described in the file cannot get applied to nodes in the cluster. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	hardware_enablement/kmm-release-notes.adoc
A	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/external-secrets-test-coverage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/external-secrets-test-coverage.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/external-secrets-test-coverage.adoc left in tree.
CONFLICT (modify/delete): modules/creating-manifest-file-customized-br-ex-bridge.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/creating-manifest-file-customized-br-ex-bridge.adoc left in tree.
CONFLICT (modify/delete): hardware_enablement/kmm-release-notes.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of hardware_enablement/kmm-release-notes.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 Fixing a few double words

In response to this:

/cherrypick enterprise-4.15

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-cherrypick-robot

@bergerhoffer: #96323 failed to apply on top of branch "enterprise-4.14":

Applying: Fixing a few double words
.git/rebase-apply/patch:132: trailing whitespace.
After creating the `NodeNetworkConfigurationPolicy` CR, copy content from the NMState configuration file that was created during cluster installation into the NNCP CR. An incomplete NNCP CR file means that the network policy described in the file cannot get applied to nodes in the cluster. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	hardware_enablement/kmm-release-notes.adoc
A	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/external-secrets-test-coverage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/external-secrets-test-coverage.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/external-secrets-test-coverage.adoc left in tree.
CONFLICT (modify/delete): modules/creating-manifest-file-customized-br-ex-bridge.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/creating-manifest-file-customized-br-ex-bridge.adoc left in tree.
CONFLICT (modify/delete): hardware_enablement/kmm-release-notes.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of hardware_enablement/kmm-release-notes.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 Fixing a few double words

In response to this:

/cherrypick enterprise-4.14

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-cherrypick-robot

@bergerhoffer: #96323 failed to apply on top of branch "enterprise-4.13":

Applying: Fixing a few double words
.git/rebase-apply/patch:132: trailing whitespace.
After creating the `NodeNetworkConfigurationPolicy` CR, copy content from the NMState configuration file that was created during cluster installation into the NNCP CR. An incomplete NNCP CR file means that the network policy described in the file cannot get applied to nodes in the cluster. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	hardware_enablement/kmm-release-notes.adoc
A	modules/creating-manifest-file-customized-br-ex-bridge.adoc
A	modules/external-secrets-test-coverage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/external-secrets-test-coverage.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/external-secrets-test-coverage.adoc left in tree.
CONFLICT (modify/delete): modules/creating-manifest-file-customized-br-ex-bridge.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of modules/creating-manifest-file-customized-br-ex-bridge.adoc left in tree.
CONFLICT (modify/delete): hardware_enablement/kmm-release-notes.adoc deleted in HEAD and modified in Fixing a few double words. Version Fixing a few double words of hardware_enablement/kmm-release-notes.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 Fixing a few double words

In response to this:

/cherrypick enterprise-4.13

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.

3 participants