4.15-backport-oadp-troubleshooting

[shdeshpa07]

cherry picked from #101423 xref: 84f9c4c

[ocpdocs-previewbot]

🤖 Mon Nov 03 07:56:02 - Prow CI generated the docs preview:
https://101567--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[openshift-ci]

@shdeshpa07: 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.

[shdeshpa07]

/cherrypick enterprise-4.14

[openshift-cherrypick-robot]

@shdeshpa07: #101567 failed to apply on top of branch "enterprise-4.14":

Applying: 4.18-backport-oadp-troubleshooting
.git/rebase-apply/patch:333: trailing whitespace.
:toc: 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	backup_and_restore/application_backup_and_restore/troubleshooting/troubleshooting.adoc
M	modules/migration-debugging-velero-resources.adoc
M	modules/velero-oadp-version-relationship.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/velero-oadp-version-relationship.adoc
CONFLICT (content): Merge conflict in modules/velero-oadp-version-relationship.adoc
Auto-merging modules/migration-debugging-velero-resources.adoc
Auto-merging backup_and_restore/application_backup_and_restore/troubleshooting/troubleshooting.adoc
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 4.18-backport-oadp-troubleshooting

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.