Use this dialog box to resolve conflicts that occur in Oracle workspaces when you are merging or refreshing conflicting data.
Keep in mind that for Oracle workspaces three sets of data are maintained for each record:
- The original value that the workspace was created with (which we call Base) and
- The latest changes to the workspace
- The parent workspace's value
When you attempt to merge or refresh conflicting data to a row in the parent or child table or workspace in interactive mode, you can indicate how the conflict is to be resolved for individual records. The Resolve Conflicts dialog box allows you to indicate which value is to be kept.
Primary Key
Indicates the Primary key for the table that the selected row is based on.
Column
Current (Workspace Name)
Indicates the record in the Current workspace that is in conflict.
Parent (Workspace Name)
Indicates the record in the Parent workspace that is in conflict.
Base
Indicates the original (Base) value from the parent workspace.
Resolution
In this section you choose the option for updating the current record.
Automatically Apply to All Remaining Conflicts
Select this check box if you want to apply the option you have selected to the remaining conflicts.
Current
Select this option to use the child value to resolve the conflict.
Parent
Select this option to use the parent value to resolve the conflict.
Base
Select this option to use the original (Base) value to resolve the conflict.
Next/Finish
When you have selected the appropriate option for this record, click this button to move to the next record. When you have resolved the last record, this button changes to Finish.
Cancel
Cancel will cancel the dialog box and display this message:
Conflict exists and conflict resolution was not executed/committed. Unable to refresh/merge <tablename> table from its parent/child workspace.