Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/common/WebService/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs | 1 | 0 | 4 | 0 | -- | 0 | SM |
/UI/Linux/LinuxClient/library/ResetPassPhraseDialog.cs | 4 | 4 | 71 | 71 | -- | 0 | SM |
/UI/Windows/iFolderShell/ConflictResolver.cs | 4 | 4 | 50 | 50 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/GlobalProperties.cs | 4 | 4 | 22 | 22 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/FormsTrayApp.cs | 3 | 3 | 58 | 58 | -- | 0 | SM |
/UI/Linux/LinuxClient/library/KeyRecoveryWizard.cs | 3 | 3 | 12 | 12 | -- | 0 | SM |
/common/WebService/ClientUpgrade.cs | 1 | 1 | 130 | 130 | -- | 0 | SM |
/UI/Linux/LinuxClient/library/iFolderConflictDialog.cs | 1 | 1 | 41 | 41 | -- | 0 | SM |
/UI/Linux/LinuxClient/library/ResetPasswordDialog.cs | 1 | 1 | 19 | 19 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/Connecting.cs | 1 | 1 | 16 | 16 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/ResetPassphrase.cs | 1 | 1 | 4 | 4 | -- | 0 | SM |
/UI/Windows/FormsTrayApp/KeyRecovery/DomainSelectionPage.cs | 1 | 1 | 4 | 4 | -- | 0 | SM |