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/core/genj/edit/EditView.java | 9 | 2 | 38 | 18 | -- | 0 | SM |
/src/core/genj/report/ReportView.java | 5 | 1 | 54 | 8 | -- | 0 | SM |
/src/core/genj/tree/TreeView.java | 6 | 0 | 18 | 0 | -- | 0 | SM |
/src/core/genj/edit/EditViewFactory.java | 5 | 0 | 182 | 0 | -- | 0 | SM |
/src/core/genj/edit/actions/OpenForEdit.java | 4 | 1 | 25 | 9 | -- | 0 | SM |
/src/core/genj/edit/actions/CreateRelationship.java | 3 | 2 | 10 | 22 | -- | 0 | SM |
/src/core/genj/util/swing/DateWidget.java | 3 | 2 | 7 | 4 | -- | 0 | SM |
/src/core/genj/table/TableView.java | 4 | 0 | 18 | 0 | -- | 0 | SM |
/src/core/genj/report/ReportViewFactory.java | 2 | 1 | 93 | 13 | -- | 0 | SM |
/src/core/genj/edit/BasicEditor.java | 2 | 1 | 18 | 21 | -- | 0 | SM |
/src/core/genj/search/SearchViewFactory.java | 3 | 0 | 8 | 0 | -- | 0 | SM |
/src/core/genj/entity/EntityView.java | 3 | 0 | 8 | 0 | -- | 0 | SM |
/src/core/genj/app/App.java | 2 | 1 | 4 | 2 | -- | 1 | SM |
/src/core/genj/search/SearchView.java | 2 | 0 | 21 | 0 | -- | 0 | SM |
/src/core/genj/timeline/TimelineView.java | 2 | 0 | 6 | 0 | -- | 0 | SM |
/src/core/genj/app/GedcomTableWidget.java | 1 | 0 | 170 | 0 | -- | 0 | SM |
/src/core/genj/edit/actions/DelProperty.java | 1 | 0 | 6 | 0 | -- | 0 | SM |
/src/core/genj/view/ActionProvider.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/tree/TreeViewFactory.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/timeline/TimelineViewFactory.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/table/TableViewFactory.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/nav/NavigatorViewFactory.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/entity/EntityViewFactory.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/edit/actions/TogglePrivate.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/edit/actions/CreateEntity.java | 1 | 0 | 4 | 0 | -- | 0 | SM |
/src/core/genj/view/ViewFactory.java | 1 | 0 | 2 | 0 | -- | 0 | SM |
/src/core/genj/app/ViewDockable.java | 1 | 1 | 234 | 25 | -- | 0 | SM |
/src/core/genj/applet/Applet.java | 1 | 1 | 154 | 17 | -- | 0 | SM |
/src/core/genj/applet/ControlCenter.java | 1 | 1 | 56 | 5 | -- | 0 | SM |
/src/core/genj/edit/actions/CreateSpouse.java | 0 | 1 | 0 | 5 | -- | 0 | UM |
/src/core/genj/edit/actions/AbstractChange.java | 1 | 1 | 2 | 6 | -- | 0 | UM |
/src/core/genj/edit/actions/CreateSibling.java | 1 | 1 | 2 | 6 | -- | 0 | UM |
/src/core/genj/edit/actions/CreateParent.java | 1 | 2 | 2 | 20 | -- | 0 | UM |
/src/core/genj/view/ViewManager.java | 1 | 3 | 369 | 116 | -- | 0 | UM |
/src/core/genj/app/Workbench.java | 1 | 8 | 716 | 44 | -- | 1 | UM |