The merge tool is used to compare, and potentially merge two projects. It can also be used to merge specific parts of another project into the current.
The Source drop-down menu is used to choose what project will be compared against the current project. By default, the menu will contain a list of all the projects currently opened. To compare against one of these projects, select them from the list. To compare against a project that is not currently opened, either open a project from the creator’s File menu, import a project from SIF using the SIF section, or select the Browse… item from the Source menu to locate an external project on disk.
Once a source project has been selected, the Compare button will become available. This will compare the two projects, and display the results in the center area. The results will be presented as a hierarchy of details. Expanding an element in the view will display more information about that element, showing the current and source's code.
Elements in the center area have checkboxes next to them. This specifies whether or not they will be included when a merge is performed. By default, all elements are selected, but individual elements may be toggled by clicking the checkbox next to them.
Merge Selected
Pressing the Merge Select button will perform the merge based on the selected elements; combining or removing elements of the source project to the current project.
Merge All
Pressing the Merge All button will replace all elements of the current project with source project’ elements. The selected elements in the tree view will be ignored.
Merge Added
Pressing the Merge Added button will add all elements of the source project into the current project. The selected elements in the tree view will be ignored.
Note that the merge operations are not undo-able via the Catalogue Creator’s undo system. However, the merge changes will not be saved until the project is saved.
Comments
0 comments
Please sign in to leave a comment.