Skip to content

Conversation

@mburke5678
Copy link
Contributor

@mburke5678 mburke5678 commented Aug 23, 2022

The Windows Containers content and any refs should now be unhidden to sync with the 23rd Aug WMCO 6.0.0. release for OCP 4.11.

Merge to only 4.11
Preview
QE not required
please merge on 23rd Aug.

This PR fixes the merge error in #49225. Amrite was not available to fix the error.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 23, 2022
@mburke5678 mburke5678 merged commit 0f2c6f5 into openshift:enterprise-4.11 Aug 23, 2022
@mburke5678 mburke5678 mentioned this pull request Aug 23, 2022
@mburke5678 mburke5678 deleted the unhide-wmco-content-6.0.0-4.11-mb branch August 23, 2022 15:27
@mburke5678
Copy link
Contributor Author

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@mburke5678: #49498 failed to apply on top of branch "enterprise-4.12":

Applying: unhide wmco content
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	installing/installing-preparing.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing-preparing.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 unhide wmco content
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".

Details

In response to this:

/cherrypick enterprise-4.12

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants