Error due to merge
Displays an error if a conflict or model inconsistency is detected during merging. There are two points where an error occurs.
- At the start of merging
- During merging
The details of each are shown below.
Error at start of merge
- An error will occur if there are uncommitted changes in the current branch (own).
- Conflicts are detected by the mechanism of Git itself so as not to overwrite uncommitted data, and an error is displayed.
Error during merging
- An error will occur if an error is detected during merging.
- In this case,
NDMergeaborts the merge process.
- In this case,
- There are two main types of errors during merging.
- Editing conflict error
- Error due to model inconsistency
- See here for the messages for each error.
Editing conflict error
- If a conflict occurs due to editing to individual models, an error will occur.
- Conflict conditions differ depending on the merge target. The conflict conditions for each target are shown below.
| Target | Contents |
|---|---|
| File | File schema versions conflict (Note 1) |
| Entities and associations | Field value changes collide with each other |
| Deleting a model conflicts with changing field values in that model | |
| Deletion of parent model and change of field value of child model conflict | |
| Interaction model | Changes in interaction elements collide (Note 2) |
| Product line model | Feature model editing clashes |
| Feature assignments (feature expressions) collide | |
| Configuration changes clash | |
| Constraint collisions between features | |
| Profile | Profile changes conflict (Note 3) |
| Project | Changes in project information (summary, categories, etc.) clash |
| Changes in the setting information on the trace page collide (The setting information of the series and the list information that is not included in the calculation of the trace coverage rate are applicable). |
- Note 1: If there is an update of the schema version that is retained for each file, it will be treated as a collision.
- Note 2: If there is one or more changes in lifelines, messages, etc., it is treated as a change. In the interaction model = sequence diagram, the coordinate information of the shape is also treated as design data, so the coordinate change is also subject to conflict.
- Note 3: Profile elements correspond to resources such as metamodels, view definitions, images, and class diagram contents. If there is one or more additions, deletions, or changes to them, it is treated as having changed.
Error due to model inconsistency
- As a result of merging without conflict, an error will occur if there is an inconsistency state of the model as shown below.
- Ownership related becomes a circular reference
- Multiple parents