From 6669966c089826262aeaacc250380a2219c48536 Mon Sep 17 00:00:00 2001 From: Mandi Ohlinger Date: Wed, 1 Dec 2021 17:30:28 -0500 Subject: [PATCH] File collisions: Put text in bullets instead of table --- .../usmt/usmt-conflicts-and-precedence.md | 47 ++++++++++++++++--- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/windows/deployment/usmt/usmt-conflicts-and-precedence.md b/windows/deployment/usmt/usmt-conflicts-and-precedence.md index 48ebaa0719..1236299462 100644 --- a/windows/deployment/usmt/usmt-conflicts-and-precedence.md +++ b/windows/deployment/usmt/usmt-conflicts-and-precedence.md @@ -218,13 +218,48 @@ You have a custom .xml file that contains the following code: ``` -For this example, the following table describes the resulting behavior if you add the code in the first column to your custom .xml file. +For this example, the following information describes the resulting behavior if you add the code to your custom .xml file. -| If you specify the following code | Resulting behavior | -|-----|-----| -| 
<merge script="MigXmlHelper.DestinationPriority()"> 
   <objectSet> 
      <pattern type="File">c:\data* []</pattern> 
   </objectSet> 
</merge>
| During ScanState, all the files will be added to the store.
During LoadState, only C:\Data\SampleA.txt will be restored. | -| 
<merge script="MigXmlHelper.SourcePriority()"> 
   <objectSet> 
      <pattern type="File">c:\data* []</pattern> 
   </objectSet> 
</merge>
| During ScanState, all the files will be added to the store.
During LoadState, all the files will be restored, overwriting the existing files on the destination computer. | -| 
<merge script="MigXmlHelper.SourcePriority()"> 
   <objectSet> 
      <pattern type="File">c:\data\ [*]</pattern> 
   </objectSet> 
</merge>
| During ScanState, all the files will be added to the store.
During LoadState, the following will occur: | +**Example 1** + +```xml + + + c:\data* [] + + +``` + +**Result**: During ScanState, all the files will be added to the store. During LoadState, only C:\Data\SampleA.txt will be restored. + +**Example 2** + +```xml + + + c:\data* [] + + +``` + +**Result**: During ScanState, all the files will be added to the store. +During LoadState, all the files will be restored, overwriting the existing files on the destination computer. + +**Example 3** + +```xml + + + c:\data\ [*] + + +``` + +**Result**: During ScanState, all the files will be added to the store. During LoadState, the following will occur: + +- C:\Data\SampleA.txt will be restored. +- C:\Data\SampleB.txt will be restored, overwriting the existing file on the destination computer. +- C:\Data\Folder\SampleB.txt will not be restored. ## Related topics