When merging, conflicts of two categories may arise. They will be indicated by a corresponding message.
Resolvable conflicts
- Device is marked as defective
- Device exists in the master
- Device cannot be moved because the target line cannot be generated
- Device was copied successfully, but the plug-in is causing an error
- Line exists in the master; same medium
- Line exists in the master; different medium
- Line is copied and moved; subsequent error for IP boundary conditions
- Area exists in the master
- Building Part exists in the master; same type
- Building Part exists in the master; different type
- Object Size of Group Address is different
- Group Address exists in the master
- Trade exists in the master
- A Main Group Address or a Middle Group Address area exists in a 2-level/3-level Group Address style in the master
- Free range exists identically in the master
- Free area overlaps in master
1. Device is marked as defective
Conflict
A device is marked as defective because e.g. its parameter dialog cannot be opened because of an plug-in related issue.
Resolution
- For plug-in related issues see here.
Message type
- Error
2. Device exists in the master
Conflict
A device with the same Individual Address exists in both projects.
Resolution
- The device in the master is kept.
- The device in the split is moved to the first free Individual Address in the line.
- If there is a line overrun, the device is given the Individual Address -.-.- and will be moved to the non-assigned devices.
Message type
- Warning
3. Device cannot be moved because the target line cannot be generated
Conflict
The target line must be moved, e.g. in case of a media conflict, but it cannot be generated because e.g. the area is already full.
Resolution
- All the devices of the target line will be moved to the non-assigned devices, i.e. they are all given Individual Address -.-.-.
Message type
- Warning
4. Device was copied successfully, but the plug-in raised an error
Conflict
The device was copied successfully but the plug-in raised an (data handling) error.
Resolution
- For plug-in related issues see here.
Message type
- Error
5. Line with same medium type exists in the master
Conflict
A line with the same address and medium type exists in both projects.
Resolution
- If the line is part of a split, the properties of the split are applied.
- If the line is part of the master, the properties of the master are applied.
- Group Addresses are merged.
Message type
- Warning
- Information
6. Line with different medium type exists in the master
Conflict
A line with the same address, but different medium type exists in both projects.
Resolution
- A copy of the split is generated in the master.
- If no more line addresses are available, the devices will be moved to the non-assigned devices, i.e. they are all given Individual Address -.-.-.
- Group Addresses are merged.
Message type
- Warning
- Error
- Information
7. IP related error after an IP Line being copied and moved
Conflict
An IP line is copied and moved, but a topology related error is raised.
Resolution
- No line will be generated, the devices will be moved to the non-assigned devices, i.e. they are all given Individual Address -.-.-.
Message type
- Error
8. Area exists in the master
Conflict
An area with the same address exists in both projects.
Resolution
- If the area is part of a split, the properties of the split are applied.
- If the area is part of the master, the properties of the master are applied.
Message type
- Warning
9. Building Part with same type exists in the master
Conflict
A building part with the same name and same type exists in both projects.
Resolution
- They will be considered as 'united' and all devices will be merged into the building part of the master.
- The properties of the master are applied: comment, status, name, description, number.
Message type
- Warning
10. Building Part with different type exists in the master
Conflict
A building part with the same name but different type exists in both projects.
Resolution
- All devices will be merged in their proper building part in the master.
- The merge will be done according to its properties: comment, status, name, description, number.
- A number is appended to the name of the split project.
Message type
- Warning
11. Group Address data length inconsistency
Conflict
The object size of objects linked with the same Group Address is different in the two projects.
Resolution
- A new Group Address is created in the master and all links from the split are taken over.
- In the split, this new Group Address is stored in the filter tables of the Coupler as a 'manually added'.
- The applied algorithm differs per Group Address, see the following tables:
3-level Group Address style
| Group Address free in Middle Group |
|
| Group Address not free in Middle Group |
|
| Middle Group not free |
|
| Main Group not free |
|
2-level Group Address style
| Group Address free in Main Group |
|
| Group Address not free in Main Group |
|
| Main Group not free |
|
Free-level Group Address style
| Group Address with identical structure free |
|
| Group Address with identical structure and/or Group Address as such not free |
(*) First a main group at the root level with the name "Merge Conflicts" is created. When it is full, a main group a the next level with the name "Merge Conflicts <number>" is created, etc. |
Note: the newly generated Group Addresses are always based on the 'Fill up' principle.
Message type
- Warning
- Error if the Group Address cannot be created.
12. Group Address exists in master
Conflict
A Group Address (representing the same data length) exists in both projects.
Resolution
- The Group Address properties of the master are kept (address, comment, name, description).
- The Group Address attributes 'Central' and 'Route' are the result of the logical OR operation between these attributes from the master and split project.
Message type
- Warning
13. Trade exists in master
Conflict
A trade with the same name exists in both projects.
Resolution
- They will be considered as united and all devices will be merged into the master trade.
- The properties of the master are applied: comment, status, name, description, number.
Message type
- Warning
14. A Main Group Address or a Middle Group Address has another Group Address style in master
Conflict
The Group Address style of a Main Group or Middle Group differ in the two projects.
Resolution
- The Group Address properties of the master are kept (address, comment, name, description).
- The Group Address attribute 'Route' is the result of the logical OR operation between this attribute from the master and split project.
Message type
- Warning
15. An identical free Group Address range exists in master
Conflict
A free Group Address range with the same range exists in both projects.
Resolution
- The Group Address properties of the master are kept: address, comment, name, description.
- The Group Address attribute 'Route' is the result of the logical OR operation between this attribute from the master and split project.
Message type
- Warning
16. A free Group Address range overlaps in master
Conflict
A free Group Address range overlaps with at least one range in the master.
Resolution
-
An internal algorithm is applied in order minimize the effect of the overlap.
-
The 'unfiltered' Group Addresses merge is the result of the logical OR operation between these Group Addresses.
- The Group Address attribute 'Route' is the result of the logical OR operation between this attribute from the master and split project.
Message type
- Warning
Non-resolvable conflicts
Some conflicts arising from a merge cannot be resolved because the resulting merge would be invalid (e.g. topology violations). In this case, the merge will have no result only a corresponding error message indicating the problems will be raised.