Skip to main content

branch and merge

Overview​

Assists with branch and merge operations.

The steps for branching and merging are explained in the following order:

  • Switch branches
  • Create a branch
  • Publish branch
  • Merge branches
  • Delete branch

Switch branch​

To switch branches, follow these steps:

Switch branch

Operating instructions
  1. Click the name of your current branch at the top of the Git Navigator.
  2. The [Switch branch] dialog will be displayed. Select the branch name to switch to and click the [OK] button.
  3. The branch will switch to the selected branch, and the name of the branch you switched to will be displayed at the top of the Git navigator.
Branch types

NDGit allows you to switch between the following types of branches:

IconType
Local BranchLocal Branch
Remote BranchRemote Branch

:::info

  • If the remote branch you want to switch to is not displayed in the Switch Branch dialog, refresh the repository and try switching again.

:::

Create a branch
​

To create a new local branch, follow these steps:

Create a local branch

Operating instructions
  1. Switch to the branch that will be the base of the branch you want to create. (Click here for details)
  2. Click the name of your current branch at the top of the Git Navigator.
  3. When the Switch Branches dialog appears, select Create a new branch and click the OK button.
  4. Click [Enter the name of the branch you want to create]. ] dialog will appear, enter the name of the branch you want to create and confirm.
  5. A branch will be created with the branch name you entered, and you will be switched to that branch.

:::info

  • A branch cannot be created if the following conditions apply.
    • If a branch with the same name already exists
    • If there are folders with the same name in the same hierarchy
      • Example: Branch: aaa/bbb cannot be created when branch: aaa exists.

:::

Publish branch​

To publish your local branch to a remote repository, follow these steps:

Publish local branch to remote repository

Operating instructions
  1. Switch the branch to the local branch you want to publish. (Click here for details)
  2. Click the Publish Branch button that appears in the Git Navigator.
  3. The local branch is published to the remote repository.

Merge branches​

To merge branches, follow these steps:

Merge branches

Operating instructions
  1. Switch branches to the branch you want to merge from. (Click here for details)
  2. Click the three dots at the top of the Git Navigator.
  3. In the menu that opens, click the Branch > Merge Branches button.
  4. Merge branch to [{current branch name}. ] dialog will appear, select the branch you want to merge and click the [OK] button.
  5. Branch merging will start and the branches will be merged after a certain amount of time.
note
  • If you want to abort the merge, click the Abort Merge button next to the Commit button on the Git Navigator.

Delete branch​

To delete a local branch, follow these steps:

Delete local branch

Operating instructions
  1. Switch to a branch other than the one you want to delete. (Click here for details)
  2. Click the three dots at the top of the Git Navigator.
  3. In the menu that opens, click the Branch > Delete Branch button.
  4. Select the branch you want to delete. ] dialog will be displayed, select the branch you want to delete and click the [OK] button.
  5. The selected branch will be deleted and will no longer be displayed in the list of branches.
info
  • NDGit does not allow you to delete remote branches. If you want to delete a remote branch, please use another Git client.
Last updated on