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 |
---|
/src/edu/rice/cs/drjava/config/OptionConstants.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java | 8 | 8 | 69 | 69 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/MainFrame.java | 1 | 1 | 16 | 16 | -- | 0 | SM |
/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java | 1 | 1 | 4 | 4 | -- | 0 | SM |
/src/edu/rice/cs/drjava/ui/NewVersionPopup.java | 2 | 3 | 42 | 42 | -- | 0 | UM |