Skip to main content

Preparing for team development using Git

Setup procedure​

Assuming that Git itself has already been set up, please carry out the following procedure.

  1. Make sure 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 installing the Next Design main body.
    If it is not installed, reinstall the Next Design main body.
About installing NDMerge

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

  1. Set gitattributes.
  • You need to set gitattributes to link NDMerge when merging Next Design model files with Git. Here, we will explain how to set it per repository and per user.

How to set it per repository

  1. Create and place a .gitattributes file in the Git repository you want to set.
  2. Add the following content to the .gitattributes file. 
# NDMerge
* .nproj merge=NDMerge
* .nmdl merge=NDMerge
* .nprof merge=NDMerge
* .iproj merge=NDMerge
* .imdl merge=NDMerge
* .iprof merge=NDMerge<br/>
  1. Commit and push the .gitattributes file to the Git repository.

How to set for each user

  1. Create and place the .gitattributes file anywhere in the local PC environment.

  2. Add the following content to the .gitattributes file. 

# NDMerge
* .nproj merge=NDMerge
* .nmdl merge=NDMerge
* .nprof merge=NDMerge
* .iproj merge=NDMerge
* .imdl merge=NDMerge
* .iprof merge=NDMerge<br/>

  1. Run the following command to set the placed .gitattributes file to the global environment.

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

  2. Install NDGit.

  • Please refer to here to install.
  1. Register the Next Design project file in Git.
  • Add the project file to be registered to the local repository, and commit and push it.
info

Next Design has two file saving formats: DB format and JSON format.
If you save in JSON format, you can check the differences in text format.
For information on how to write in JSON format and display the differences, please refer to here.

info

When using Git, file names may be garbled in the repository commit history.
For information on how to prevent garbled characters, please refer to here.

Last updated on