NDMerge command line tool
Overview
What is NDMerge?
NDMerge
is a command line tool for merging data handled by Next Design.- Merge is not a simple text merge, but a semantic merge for "Model".
- Semantic merging refers to building logical information and then reflecting the differences.
- However, it does not consider inconsistencies between model elements due to merge results (the tool does not automatically resolve the inconsistencies).
- Therefore, it is necessary to correct the data in advance so that inconsistencies do not occur.
Cooperation with Git
- By specifying
NDMerge
as a Git merge tool, you can merge the data from Next Design in the current branch of Git with the specified other branch.- When merging with Git,
NDMerge
is started to merge the data of Next Design. The merge result is displayed on the Git command line. If there is a conflict during merging, it will be notified as an error. - Merge works only for Next Design files, and for other files, the merge tool specified by Git as standard works.
- When merging with Git,
- For more information on working with Git, see Overview of Development Flow with Git.
Basic concept
- Merge
- Adopting either your own change or the other party's change and reflecting it in the model is called merging.
- Conflict
- The state where the changed part of the model edited by Next Design is the same as the change of oneself and the change of the other party, and it is not possible to mechanically determine which one should be adopted is called a conflict.
Operating environment
The following environment is required to use NDMerge
.
If the conditions are not met, NDMerge
may not work properly.
Software
Category Target OS Windows 10 Application Next Design V2.0 Component .NET Core 3.1 Applications that can be linked
Category Target Version control system Git
Installation method
Please refer to here for how to install NDMerge
.
Related information
If you want to know more about NDMerge
, see below.
- Functional overview of the tool
- Developed by Git
- Command list