Applying: OSDOCS 18143 Document how the boot image skew management feature works
.git/rebase-apply/patch:104: trailing whitespace.
When boot image skew enforcement is active in a cluster, the Machine Config Operator (MCO) examines the boot image version reported in the `MachineConfiguration` object to determine if that boot image is appropriate for the cluster. If the boot image version is too old, the Operator reports that _boot image version skew_ is detected and blocks cluster updates until you manually update the boot image or disable boot image skew enforcement by setting the `None` mode, as described in this section. 
.git/rebase-apply/patch:124: trailing whitespace.
You can configure the current boot image skew enforcement mode that the Machine Config Operator (MCO) uses. By configuring the boot image skew enforcement mode, you can determine if the boot image version in the `MachineConfiguration` object is updated automatically or manually. 
.git/rebase-apply/patch:130: trailing whitespace.
All other platforms default to manual mode with the {product-title} version set as the boot image version in the `MachineConfiguration` object. In manual mode, you are expected to manually update the `MachineConfiguration` object with new boot image version whenever you update the boot image. 
.git/rebase-apply/patch:198: trailing whitespace.
Review the following information to learn about the boot image skew enforcement modes. Use the information to determine the best method for your cluster. 
.git/rebase-apply/patch:202: trailing whitespace.
Automatic:: 
warning: squelched 6 whitespace errors
warning: 11 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/mco-update-boot-images-configuring.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/mco-update-boot-images-configuring.adoc
CONFLICT (content): Merge conflict in modules/mco-update-boot-images-configuring.adoc
Auto-merging _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
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS 18143 Document how the boot image skew management feature works