Summary of error messages
If a merge error is detected, an error message will be displayed on the Git console. Please refer to Example of handling errors during merging to resolve the error.
Error message configuration
The error message is structured and displayed as follows.
- Error code
- Error summary
- Error details
Example error message
[ERROR:e1001] Model "Interrupt XXX" is conflicted.
File: UseCaseModel-A.nmdl
Id: XXXX
"Description" field: Own is "XX", Other is "YY".
"Unit" field: Own is "cm/s", Other is "m/s".
Error message details
Shows the configuration details of the error message.
1.Error code
The following will be displayed at the beginning of the error message. For error codes, refer to the error summary table: Error code column.
[ERROR:Error code]
2.Error summary
The following message will then be displayed depending on the target.
| No. | Category | Target | Content | Error code | Error message |
|---|---|---|---|---|---|
| 1 | File | Schema version | File schema versions conflict | e0001 | File versions are different. |
| 2 | Conflict due to editing | Model | Field value changes conflict | e1001 | Model "{Model name}" is conflicted. |
| 3 | Deleting a model conflicts with changing a field value in that model | e1002 | Model "{Model name}" is conflicted by deleting and editing. | ||
| 4 | Deletion of parent model conflicts with change of field value of child model | e1002 | Model "{Model name}" is conflicted by deleting and editing. Note 1 | ||
| 5 | Relationship | Field value changes conflict | e2001 | Relation of "{Original model name}" is conflicted. Note 2 | |
| 6 | Relation of "{Original model name}" is conflicted by deleting and editing. | e2002 | Relation of "{Original model name}" is conflicted by deleting and editing. 2 | ||
| 7 | Relation of "{Original model name}" is conflicted by deleting and editing. Note 2, Note 3 | ||||
| 8 | Interaction Model | Interaction element changes conflicted | e3000 | Interaction Model "{Model name}" is conflicted. | |
| 9 | Product Line Model | Feature Model Changes Conflict | e4001 | Feature Model "{Feature Name}" is conflicted. | |
| 10 | Feature assignments conflict | e4002 | Feature Condition Formula of "{Model name}" is conflicted. | ||
| 11 | Configuration changes conflicted | e4003 | Configuration "{Product name}" is conflicted. | ||
| 12 | Constraints between features | e4004 | Constraint of "{Name of feature the constraint is related to}" is conflicted. | ||
| 13 | Profile | Profile changes conflicted | e5000 | Profile is conflicted. | |
| 14 | Project | Project changes conflicted | e6001 | Project is conflicted. | |
| 15 | Trace setting information conflicts | e6002 | Trace Setting "{Trace setting name}" is conflicted. | ||
| 16 | Trace Excluded Setting is conflicted. | e6003 | Trace Excluded Setting is conflicted. | ||
| 17 | Error due to model inconsistency | Model, relationship | Owning relationship becomes a circular reference | e9001 | "{Reference model name of the relationship}" contains circular reference. |
| 18 | There are multiple parents | e9002 | "{Model name}" has multiple owners. |
- Note 1: The error code and message are the same as No.3.
- Note 2: A similar message will be displayed if there is a conflict between relationships.
- Note 3: The error code and message are the same as No.6.
3.Error details
The following is indented and displayed after the message.
- file name
- Displays the file name containing the conflicting target element.
File : UseCaseModel-A.nmdl
- Displays the file name containing the conflicting target element.
- Model ID
- Displays the ID of the target element whose name will be displayed in the error message.
Example Id: XXXX
- Displays the ID of the target element whose name will be displayed in the error message.
- Field conflict information
- List information about conflicted fields.
Example "{Field name}" field: Own is{Changes in the current branch (own)}, Other is{Changes in the specified other branch (other)}.
- List information about conflicted fields.