Preparing for team development with Git

Setup Instructions

Assuming that Git has already been set up, follow the steps below.

1. Make sure NDMerge is installed.
   • Execute the following command.

     git config --global merge.NDMerge.name
     

   • If NDMerge is installed, you will get the following response.

     nd diff merge application

   • If NDMerge is not installed, please refer to here to install NDMerge.

Installing NDMerge

NDMerge is automatically installed in Next Design's installation folder when Next Design is installed. Please note that if you install Next Design later on where NDMerge is installed, your existing settings will be overwritten.

2. Set gitattributes.
   

   • It is necessary to set gitattributes in order to link NDMerge when merging Next Design model files with Git. This section explains how to set for each repository and how to set for each user.
     

     How ​​to set for each 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
        * .iproj merge=NDMerge
        * .imdl merge=NDMerge
        * .iprof merge=NDMerge<br/>
     3. Commit and push the .gitattributes file to your Git repository.

     How ​​to set for each user

     1. Create and place a .gitattributes file anywhere in your 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/>
     3. Execute the following command to set the placed .gitattributes file in the global environment.

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

3. Install NDGit.

   • See here to install.

4. Register the Next Design project file in Git.

   • Add the project file to be registered to the local repository, and commit/push it.
     

info

Next Design has two file saving formats, DB format and JSON format.
If you save in JSON format, you will be able to check the difference in text format.
Refer to here for the JSON format notation method and the difference display.

info

When using Git, filenames may be garbled in the commit history of the repository.
See here for how to prevent garbled characters.