How to Install NDMerge
NDMerge is automatically installed in the Next Design installation folder when Next Design is installed.
If you want to use NDMerge without installing Next Design, please install it using the following steps.
While NDMerge is automatically installed when Next Design is installed, the "gitattributes file" is not configured.
To safely merge projects, always configure Git merges to work with NDMerge.
If the "gitattributes file" is not configured and text merging is performed with another tool, the project may be corrupted.
Follow the instructions here and be sure to configure the "gitattributes file".
Installation Procedure
- Windows version
- Linux version
- Download the NDMerge file set (zip file) from the support site below.
After downloading the zip file, remove the security protection as follows before extracting the files.
(1) Right-click the zip file and select [Properties].
(2) Read the explanation of [Security] displayed at the bottom of the [General] tab, check the [Allow] checkbox on the right, and click the [OK] button.
-
Extract the zip file to your desired installation folder.
-
Launch Terminal and navigate to the installation folder.
-
Execute the following command:
.\ndmerge git-setup install
For details on this command, please refer to here.
- To ensure that Git merges always work with
NDMerge, follow these instructions and be sure to configure the "gitattributes file".
Note that this program requires the installation of .NET 10.0 to run.
- Download the NDMerge file set (zip file) from the support site below.
-
Extract the zip file to your desired installation folder.
-
Navigate to the installation folder and execute the following command:
chmod +x ndmerge -
Next, execute the following command:
./ndmerge git-setup install
For details on this command, please refer to here.
- To ensure that Git merges always work with
NDMerge, follow these instructions (../../modeling-guide/git/setup.md#gitattributes-settings) and configure thegitattributesfile.
Post-Installation Verification
- Running the
NDMergesetupcommand configures thegitconfigfile for the global environment (each OS login user). - You can verify the configuration by running the following command in the installation folder:
./ndmerge git-setup list
-
If the
merge.NDMerge.driveritem is added to the configuration, it is configured correctly. -
Example of execution on Windows
> ./ndmerge git-setup list
exec: git config merge.NDMerge.name
nd diff merge application
exec: git config merge.NDMerge.driver
'[Absolute path for each user environment]/ndmerge.exe' merge -o %A -t %B -b %O -m %A -p %P -l warn
- If the path set in
gitconfigand the location of the storage folder are different,NDMergewill not work.
If you move the storage folder, run thesetupcommand again and update the settings ingitconfig.
Update Procedure
If NDMerge is already installed, follow these steps to update to the new version of NDMerge.
- Windows version
- Linux version
- Download the complete NDMerge file set (zip file) for the new version from the support site below.
After downloading the zip file, please remove the security protection as follows before extracting the files.
(1) Right-click the zip file and select [Properties].
(2) Read the explanation of [Security] displayed at the bottom of the [General] tab, check the [Allow] checkbox on the right, and click the [OK] button.
- Delete all existing files in the installation folder.
- Extract the new version zip file to the installation folder.
- Launch Terminal and navigate to the installation folder.
- Run the following command to confirm that you have updated to the new version.
.\ndmerge --version
- Download the complete NDMerge file set (zip file) of the new version from the support site below.
-
Delete all existing files in the installation folder.
-
Extract the new version zip file to the installation folder.
-
Navigate to the installation folder and execute the following command.
chmod +x ndmerge
- Execute the following command to confirm that you have updated to the new version.
./ndmerge --version
Uninstallation Procedure
-
Launch Terminal and navigate to the
NDMergeinstallation folder. -
Execute the following command.
./ndmerge git-setup uninstall
- Delete the contents of the
.gitattributesfile as described in .gitattributes settings. - If settings other than
NDMergeare not described in the.gitattributesfile, execute the following command:
git config --global --unset core.attributesfile
- Delete all files in the installation folder.