NDMerge command line tool

Overview

NDMerge is a command line tool for merging data handled by Next Design.
The merge is not a simple text merge, but a semantic merge on "Model".
- Semantic merging refers to reflecting differences after constructing logical information.
However, inconsistencies between model elements resulting from merging are not considered (the tool does not automatically resolve inconsistencies).
- Therefore, it is necessary to correct the data in advance so that inconsistencies do not occur.

By specifying NDMerge as Git's merge tool, you can merge Next Design's data in Git's current branch (own) and the specified other branch (other) into one.
- When merging with Git, NDMerge will start and merge Next Design data. The merge result is displayed on the Git command line. Any conflicts when merging will be flagged as errors.
- Merge works only for Next Design files, and for other files the standard Git merge tool works.
For more information about working with Git, see Introduction to Team Development with Git.

merge
- Adopting either your changes or the other party's changes and reflecting them in the model is called merging.
Conflict
- The changed part of the model edited by Next Design is the same part of the change of the user and the change of the other party, and it is called a conflict when it is not possible to mechanically judge which one should be adopted.

The following environment is required to use NDMerge.
If the conditions are not met, NDMerge may not work properly.

Category	Target
Version control system	Git

See here for how to install NDMerge.

See below for more information on NDMerge.