Skip to main content

NDMerge command line tool

Overview

What is NDMerge

  • 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 of the "Model".
    • A semantic merge refers to reflecting differences after constructing logical information.
  • However, it does not take into account inconsistencies between model elements due to the merge result (the tool does not automatically resolve inconsistencies).
    • Therefore, you need to correct the data in advance to prevent inconsistencies.

Integration with Git

  • By specifying NDMerge as the Git merge tool, you can merge Next Design data in the current Git branch (own) and the specified other branch (other) into one.
    • When merging with Git, NDMerge is launched and merges the Next Design data. The merge result is displayed on the Git command line. If there is a conflict during the merge, an error is notified.
    • Merging only works on Next Design files, and the merge tool specified by default in Git works on other files.
  • For details on integration with Git, see Overview of Team Development Using Git.

Basic concept

  • 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.

Installation method

NDMerge is automatically installed in the Next Design installation folder when installing the Next Design main body.
If you want to use NDMerge without installing Next Design, please refer to here to install it.

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