The Review network merge report displays the summary and conflicts when you merge a branch to the common base (parent) network using the
Merge changes from another network dialog.
The report shows, in their corresponding tabs, the objects that have been added, modified, renamed, or deleted.
The report also lists the various objects with conflicts. You can select whether to accept the incoming value or use the current value for each of the object listed.
In the Conflict tab, the Incoming Value (highlighted in green) is applied to the parent network. Clicking Undo changes this and makes the Current Value the one that is used.
Selecting the object in the report will highlight the object in the
GeoPlan.
| Item
|
Description
|
|---|
| Added
|
| Type
|
The type of object that was added.
|
| Scenario
|
The scenario where the object was added.
|
| New ID
|
The asset ID of the object.
|
|
| Modified
|
| Type
|
The type of object that was modified.
|
| Scenario
|
The scenario where the object was modified.
|
| ID
|
The asset ID of the object.
|
| Field
|
The field of the object.
|
| Current Value
|
The value in the branch network.
|
| Incoming Value
|
The value applied to the parent network.
|
|
| Renamed
|
| Type
|
The type of object that was renamed.
|
| Scenario
|
The scenario where the object was renamed.
|
| ID
|
The asset ID of the object.
|
| New ID
|
The new asset ID applied to the parent network.
|
| Details
|
Provides additional information regarding the change.
|
|
| Deleted
|
| Type
|
The type of object that was deleted.
|
| Scenario
|
The scenario where the object was deleted.
|
| ID
|
The asset ID of the object.
|
|
| Conflict
|
| Type
|
The object type of the given conflict.
|
| Scenario
|
The scenario of the given conflict.
|
| ID
|
The asset ID of the given conflict.
|
| New ID
|
The new asset ID for the object (if applicable).
|
| Field
|
The field of the given conflict.
|
| Base Value
|
The value in the common base (parent) network.
|
| Current Value
|
The value in the branch network.
|
| Incoming Value
|
The value applied to the parent network.
Clicking Undo will change this and will make the Current Value the one that will be applied.
|
| Undo
|
Check this box and the Current Value will be applied to the parent network.
|
| Details
|
Provides additional information regarding the conflict.
Conflicts may arise if you (but not limited to):
- Renamed two objects to have the same name.
- Changed the type of an object that has already been added to the parent.
|
|
| Context menu options
|
| Edit Object
|
Opens the
Object Properties window for the of selected object where you can then view the fields values.
|
| Find Object
|
Finds the object the in the
GeoPlan.
|
| Select All Object
|
Selects all the objects in the list.
|
| Commit History
|
Shows the
commit history
and you can go to details to view the commit information.
|
| Undo
|
Undoes the change such that the current value will be used instead of the incoming value. This is applicable in the Conflict tab.
|
|
