Skip to main content

intro

Outline of development flow using #Git

Introducing Git to modeling

  • Introducing a version control system is essential for large-scale distributed development of system software. Especially when there is a possibility of changing the same range in parallel, Git that automatically judges and merges new changes is suitable.
  • Next Design provides a dedicated tool NDMerge that works with Git to logically merge modeled data. Therefore, even if you are developing in parallel with Git, you can proceed with development while maintaining logical data integrity.
    • See here for more information on NDMerge.

Relationship between Next Design and Git

  • Next Design itself does not provide Git-related operation methods such as pull and push. Use Git-specific clients for Git operations (console applications, TortoiseGit, etc.).
  • NDMerge is set up and used as a Git merge tool. NDMerge merges the data on a per-file basis in Next Design (such as .nmdl).
  • If you have saved the Next Design file in text (JSON) format, you can also see the change diffs in the diffs on Git.

Preparation for operation in conjunction with Git

Assuming that the Git main unit has already been set up, perform the following procedure.

  1. Install NDMerge.
    • For details on the installation method, refer to here.
  2. Register the Next Design project file with Git.
    • Add the project file to be registered to the local repository and commit/push.
    • If you save the project file in JSON format, you will be able to check the model difference in text in Git. Please refer to here for how to read the difference in JSON format.

Basic usage in conjunction with Git

No special settings are required after setting NDMerge or Git in Install NDMerge. Basically, you can use it without any problem by performing normal Git operation as shown below.

  1. Perform a branch merge in the Git client.

  2. If the Next Design file (such as .ndml) is to be merged, Git will automatically launch NDMerge to perform the merge.

  3. When the merge is complete, the console will display the results.

  4. Check the result and push the merged file or deal with the error.

    • If the merge completes successfully, Git will generate a commit and push it.
    • If a conflict occurs during merging, an error will be displayed in the Git console, and only the files with the error will remain unmerged.
      • Refer to here for the details of the error. Also, refer to here for handling errors.

If you want to know more about NDMerge, see below.

Last updated on