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 |
---|
/FireIRC/Properties/GlobalAssemblyInfo.cs | 2 | 0 | 14 | 0 | -- | 0 | SM |
/FireIRC.Resources/Client.cs | 1 | 1 | 4 | 4 | -- | 0 | SM |
/FireIRC.Resources/Forms/ChannelWindow.cs | 2 | 2 | 18 | 19 | -- | 0 | UM |