How to install NDMerge
Here is how to install NDMerge
.
Installation Instructions
- Download the NDMerge file set from the following support site.
After downloading the zip file, remove the security protection as follows and extract the file.
(1) Right-click the zip file to display [Properties].
(2) Read the description of [Security] displayed at the bottom of the [General] tab, check the [Allow] check box on the right, and press the [OK] button.
-
Unzip the zip file and store it in any installation folder.
-
Start the command prompt and move to the above storage folder.
-
Execute the following command.
ndmerge git-setup install
- See here for commands.
-
If you want
NDMerge
to work in conjunction with Git's merge command execution, follow this procedure and set ".gitattributes file".Note that .NET 6.0 must be installed to run this program.
Confirmation after installation
- When you run the
setup
command ofNDMerge
, it will be set togitconfig
in the global environment (for each OS login user).-
You can check the set contents by executing the following command.
ndmerge git-setup list
-
If the
merge.NDMerge.driver
item is added to the settings, it is set correctly. -
Execution example
> 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
gitconfig
and the storage folder location are different,NDMerge
will not work.
If you move the storage folder, execute thesetup
command again to update the settings ofgitconfig
.
Update procedure
If you already have NDMerge
installed, follow the steps below to update to a newer version of NDMerge
.
- Download the latest version of the NDMerge files from the support site below.
After downloading the zip file, remove the security protection as follows and extract the file.
(1) Right-click the zip file to display [Properties].
(2) Read the description of [Security] displayed at the bottom of the [General] tab, check the [Allow] check box on the right, and press the [OK] button.
-
Extract the new version of
NDMerge
zip file. -
Overwrite the files in the installed
NDMerge
installation folder with the files extracted above.
Confirmation after update
- To check if the update was successful, at a command prompt, navigate to the
NDMerge
installation folder and run the following command.ndmerge --version
Uninstall Instructions
- Open a command prompt and navigate to the
NDMerge
installation folder. - Execute the following command.
ndmerge git-setup uninstall
- Delete the contents described in the
.gitattributes
file in .gitattributes settings. - If there are no settings other than
NDMerge
in the.gitattributes
file, run the following command.git config --global --unset core.attributesfile
- Delete all files in the installation folder.