Home > Data Modeler Dialog Boxes > Subversion: XML Metadata Co...
Use this dialog box to resolve conflicts when there are conflicts in the values for certain properties.
Filter: Lets you control the list of properties displayed.
Consider "Changed Time" Property: If this option is enabled, two properties with identical content but different timestamps for the last change are considered to be different and thus potentially in conflict. If this option is not enabled, creation timestamps are ignored in comparing properties.
Details tab: For each property, shows the property name, a Selected box indicating whether it is to be merged if you click Merge, and the values for the property in the left and right columns shown at the top of the box.
Merge: Merges the selected property definitions
Close: Closes the dialog box without performing a merge.
Related Topics