Skip to main content

V2.1

The package has been updated with the upgrade to Next Design V4.0.

New Features

  • You can now cherry-pick the changes from the commit selected in the repository's commit history to the current project.
  • You can now check the commit history of a specified branch from the ribbon [Git] > [Commit History] > [Repository Commit History].
  • You can now check the differences and commit history of model files that have been renamed or restructured in NDGit.
  • You can now resolve conflicts from NDGit even if the model file has been renamed or restructured.
  • You can no longer resolve conflicts that would cause data destruction if you resolve them (such as when the TopElementId has changed, or when the project becomes invalid as a result of merging).
  • The "Do not automatically commit on merge" option has been removed.
  • If there are unsaved changes when committing, you will now be asked whether to continue.
  • If inconsistency verification is performed when committing, the merge will only be performed automatically if there are no inconsistencies when merging.

Fixed issues and limitations

  • Fixed an issue where the mouse cursor did not become an hourglass when selecting a changed file displayed in the Git Navigator and executing [Show changes], making it unclear whether the operation was accepted.
  • Fixed an issue where the merge direction of model tags could not be specified in the conflict analysis window.
  • Fixed an issue where an error occurred and the direction could not be applied when resolving conflicts between files with different major versions, even if the direction to apply was specified in the conflict list.