Skip to main content

ndmerge merge command

Name​

ndmerge merge - Merge the specified Next Design files.

Syntax​

Specify target and merge.

ndmerge merge [-o|--own <PATH>] [-b|--base <PATH>] [-t|--other <PATH>] [-m|--merged <PATH>] [-p|--path <PATH>] [-l|--log-level <LEVEL>] [-a|--auto <TARGET>] [-f|--force-merge] [-s|--merge-strategy <STRATEGY>]

Check command help.

ndmerge merge [-?|-h|--help]

Options​

Shows options for the ndmerge merge command.

Merge options​

  • -o|--own <PATH> (required)
    • Specify own files for diff/merge.
  • -b|--base <PATH> (required)
    • Specify the base file for diff/merge.
  • -t|--other <PATH> (required)
    • Specify the target file for diff/merge.
  • -m|--merged <PATH> (required)
    • Specify the destination file for the merge result.
  • -p|--path <PATH> (optional)
    • Specify files to be merged.
  • -l|--log-level <LEVEL> (optional)
    • Specify the log output level.
    • You can specify the following for LEVEL.
      • error - error
      • warn - Warning
      • info - information
      • none - none
    • Initial value is warn.
  • -a|--auto <TARGET> (optional: preview feature)
    • If it is possible to merge, it merges normally, and when conflict is detected, the value specified by TARGET is used preferentially. However, consistency is not guaranteed.
    • You can specify the following for TARGET.
      • own - Own changes take precedence.
      • other - prefer the other's changes.
  • -f|--force-merge (optional: preview feature)
    • If merging is possible, it merges normally, and when conflicts are detected, the conflicted elements and values return to the base state. However, consistency is not guaranteed.
    • If -a|--auto is specified, it takes precedence.
  • -s|--merge-strategy <STRATEGY> (optional: preview feature)
    • Switch merge strategies.
    • You can specify the following for STRATEGY.
      • 1.0 - normal merge. Detects and displays errors described in Merge errors.
      • 1.1 - Unlike 1.0, you will be able to merge profile and sequence diagram changes. However, consistency is not guaranteed.
    • Initial value is 1.0.

Single option​

  • -?|-h|--help
    • Outputs a list of available commands and options.

Example of use​

  • Merge the data between the specified model files. Merge processing is aborted when an error such as a conflict occurs.

    ndmerge merge -o xx/projectX/models/Component-A.nmdl -b yy/projectX/models/Component-A.nmdl -t zz/projectX/models/Component-A.nmdl -m mm/projectX/models/Component -A.nmdl

  • Prioritize the value of the current branch (own) and merge. Continue merging even if errors such as conflicts occur. This is a preview feature.

    ndmerge merge -o xx/projectX/models/Component-A.nmdl -b yy/projectX/models/Component-A.nmdl -t zz/projectX/models/Component-A.nmdl -m mm/projectX/models/Component -A.nmdl -a own
Last updated on