Merge errors
If a conflict or model inconsistency is detected during a merge, an error is displayed. There are two points where an error occurs:
- When the merge starts
- During the merge
Details of each are shown below.
Errors at the start of a merge
- An error occurs if there are uncommitted changes in the current branch (own).
- Conflicts are detected by the mechanism of Git itself to prevent uncommitted data from being overwritten, and an error is displayed.
Errors during a merge
- An error occurs if an error is detected during a merge.
- In this case,
NDMergewill stop the merge process. - Errors during a merge can be broadly divided into two types:
- Editing conflict errors
- Model inconsistency errors
- For the messages for each error, see here.
Conflict errors due to editing
- If a conflict occurs due to edits to an individual model, an error will occur.
- The conditions that result in a conflict vary depending on what is being merged. The conflict conditions for each target are shown below.
| Target | Contents |
|---|---|
| File | Schema version conflicts between files (Note 1) |
| Entity or relationship | Field value changes conflict |
| Deleting a model and changing the field value of that model conflict | |
| Deleting a parent model and changing the field value of a child model conflict | |
| Interaction model | Changes to interaction elements conflict (Note 2) |
| Product line model | Edits to feature models conflict |
| Feature assignments (feature expressions) conflict | |
| Configuration changes conflict | |
| Constraints between features conflict | |
| Profile | Profile changes conflict (Note 3) |
| Project | Changes to project information (summary, category, etc.) conflict |
| Changes to trace view settings conflict (applies to series settings information and list information not included in trace coverage calculation) |
- Note 1: If there is an update to the schema version stored on a file-by-file basis, it is treated as a conflict.
- Note 2: If there is one or more changes to a lifeline or message, it is treated as a change. In addition, in an interaction model (sequence diagram), the coordinate information of shapes is also treated as design data, so changes to coordinates are also subject to conflicts.
- Note 3: Profile elements include metamodels, view definitions, resources such as images, and the contents of class diagrams. If there is one or more additions, deletions, or changes to these, it is treated as a change.
Errors due to model inconsistencies
- As a result of merging without conflicts, an error occurs if there are any of the following model inconsistencies.
- Owned relationships become circular references
- There are multiple parents