Operational notes

In the development flow with Git using Next Design and NDMerge, please note the following points to make it easier to operate.

Minimize conflicts

• Merge with NDMerge is done in file units (such as .nmdl files). Therefore, it is less likely that conflicts will occur if you pay attention to the following points.
  • By dividing the model file into small pieces, conflicts are less likely to occur.
    • In particular, it is recommended to divide the model file between models that may be developed in parallel.
  • If the structure of the metamodel is also defined on the premise of parallel development, the operation will be smoother.
    • For example, there is a structure that can be divided and designed for each component after preparing one common data definition for reference so that the data definition can be referred to.
  • Furthermore, by paying attention to the following, you can avoid unnecessary conflicts and operate.
    • Do not edit the project itself in parallel.
      • In particular, model file division, integration, and reference registration are not performed for each branch.
    • Do not edit the profile in parallel.
    • Do not edit product line models (especially feature models, configurations) in parallel.

Prevent model inconsistencies

• In the following cases, the merge result may result in an inconsistent model. Be careful not to make these parallel edits.
  • Editing across files and parallel editing of related models
    • Splitting and integrating model files and editing models in those model files
    • Moving a model across model files and editing fields for that model
  • Editing profiles and parallel editing of related models
  • Model retyping and parallel editing of fields in that model
  • Parallel editing of the order of child element models and reference models of the same model

Make it easier to see the differences in the text

• By saving the project in JSON format, you can check the model change difference in text. It will be easier to check the text difference on Git by paying attention to the following points.
  • Save the DB format project as a JSON format project again.
    • You can also save the DB format file as JSON format by saving it as a name.
    • You can change the default save format from the Save Format on theOptionstab on the backstage of the ribbon.
• If you set to include the model path of the reference destination, it will be easier to understand the relationship between the reference source and the destination.
  • Since ND Merge is merged on a file-by-file basis, it does not always indicate the correct path if the model indicated by the referenced path is a different file.
    • In another file, if the referenced model is renamed or the model is moved, the path may be different.
  • You can change the settings and update the referenced path to the latest version below.
    • You can change the setting from the Save option in theInformationtab of the backstage of the ribbon with Include referenced model path.
    • You can also update the referenced path to the latest by executing Update project file from Manage project files in the Information tab.
• If the elements that are in a parent-child relationship are structured, it will be easier to check additions, deletions, and order changes.
  • You can change the settings in the Structured and Save`` field item in the Field Inspector.

Related item

• Overview of development flow using Git