Skip to main content

V2.0

V2.0.3.50704 (Linux Version)

The NDMerge Linux version has been released.

Changes

  • The logic for identifying file paths in the git command has been improved to support Linux environments as well.

Except for the above, it is the same as 2.0.2.50109 (Windows version), and there are no changes to the Windows version.

V2.0.2.50109 (Windows Version)

The tool has been updated along with the upgrade to Next Design V4.0.

New Features

  • When performing a merge (including pull) while mutually editing profile information, changes from both sides will be preserved as much as possible.
  • When inconsistencies are detected in profile element merges, they will no longer be merged as conflicts.
  • The following cases are now considered inconsistencies in profile element merges:
    • Cyclic parent-child relationships in packages.
    • Parent profile elements no longer exist.
    • Multiple element view definitions corresponding to the same field exist.
    • Referenced custom resources do not exist.
  • You can now check the diff information of model files that have been moved or renamed as the diff of the project's unit information.
    • Previously, when model files were moved or renamed, their diffs could not be obtained, but now you can check them as diffs of the project's unit information.
  • If the project data contains unit files with the same path but different TopElementId, the merge will be aborted.
    • Previously, when merging model files with different TopElementIds that were changed (moved or renamed) to the same path by Own and Other respectively, the model files after the path change were treated as conflicts. Now, the merge will be stopped. An error [e9003] will be logged at this time.
  • Files with schema versions of Next Design can now be merged as long as the major version matches, even if the version has been updated.
    • This applies to files with schema versions between 11 and 13 (i.e., up to V4 series schema versions).

Fixed Issues and Constraints

  • When performing a merge (including pull) while mutually editing profile information, issues related to move/order change merges have been resolved.
  • When merging with NDMerge, improvements were made to preserve the order of collections as much as possible.