Preparing for Team Development Using Git
Setup Procedure
Assuming that Git itself is already set up, please follow the steps below.
- Confirm that
NDMergeis installed.
- Execute the following command:
git config --global merge.NDMerge.name
- If
NDMergeis installed, the following response will be returned:
nd diff merge application
NDMergeis 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.
Please note that if you install Next Design later in an environment where NDMerge is already installed, existing settings will be overwritten.
- Install
NDGit.
- Please refer to here for installation instructions.
- Register Next Design project files with Git.
- Add the project files to your local repository, commit, and push.
Next Design project files are saved in JSON format, allowing you to view differences in text format.
For information on JSON format notation and displaying differences, please refer to here.
When using Git, filenames may appear garbled in the repository's commit history.
For methods to prevent garbled characters, please refer to here.
When starting Next Design, you may see the following error message:
Failed to activate extension "NextDesign.Git.Extension". (NDMerge is not installed.)
This occurs if Next Design is installed before Git.
Next Design registers NDMerge in the Git configuration file (.gitconfig) during installation, so Git must be installed first.
Therefore, the tools must be installed in the following order:
- Git
- Next Design
- NDGit
If you are already experiencing this error, please resolve it using one of the following methods:
- Rerun the Next Design installer and perform a [Repair]. (Recommended)
- Manually set up
NDMergeaccording to the NDMerge Installation Instructions.