Skip to main content

Preparing for Team Development Using Git

Setup Procedure​

Assuming that Git itself is already set up, please follow the steps below.

  1. Confirm that NDMerge is installed.
  • Execute the following command:

git config --global merge.NDMerge.name

  • If NDMerge is installed, the following response will be returned:

nd diff merge application

  • NDMerge is automatically installed in the Next Design installation folder when the Next Design main program is installed.
    If it is not installed, please reinstall the Next Design main program.
About NDMerge Installation

Please note that if you install Next Design later in an environment where NDMerge is already installed, existing settings will be overwritten.

  1. Configure gitattributes.
  • To use NDMerge when merging Next Design model files and other files with Git, you need to configure gitattributes. This section explains how to configure it per repository and per user.

Configuring per repository

  1. Create and place a .gitattributes file in the Git repository you want to configure.
  2. Add the following content to the .gitattributes file: 
# NDMerge
* .nproj merge=NDMerge
* .nmdl merge=NDMerge
* .nprof merge=NDMerge
  1. Commit and push the .gitattributes file to the Git repository.

Configuring per user

  1. Create and place a .gitattributes file in any location on your local PC.
  2. Add the following content to the .gitattributes file: 
# NDMerge
* .nproj merge=NDMerge
* .nmdl merge=NDMerge
* .nprof merge=NDMerge
  1. Execute the following command to set the placed .gitattributes file as a global environment.

git config --global core.attributesfile [absolute path to .gitattributes file]

  1. Install NDGit.
  • Refer to here for installation instructions.
  1. Register the Next Design project files with Git.
  • Add the project files to be registered to your local repository, commit, and push.
info

Next Design project files are saved in JSON format, so you can check the differences in text format.
For information on JSON format notation and displaying differences, please refer to here.

info

When using Git, filenames may appear garbled in the repository's commit history.
For information on how to prevent garbled characters, please refer to here.

Last updated on