View: Git Branches

The view is refreshed.

Copy (git copy)

Opens the Create New Branch dialog to create a new local branch as a copy of the currently selected local branch (see above)

Delete (git branch -D)

The selected branch is deleted, even if the branch has not yet been merged completely.

Note: The current branch cannot be deleted.

Checkout (git checkout)

As a result of the Checkout operation, the selected branch becomes the current branch. This means that the Git operations act on the contents of this branch, which are loaded into the local Git repository ("working directory") for this purpose.

A checkout is prevented by uncommitted changes.

When dealing with a remote branch – an entry under Remote (<n>) – the following options are possible:

Merge

(git merge)

Clicking the button will execute the command directly. Alternatively, you could also set options for it. To do this, use the arrow key to select the Merge with options command. The Merge Branch dialog opens where you can select the Options which is valid for the current merge action.

Merging requires the name and email address of the user. This information is taken from the Git settings. If this is not possible, then a dialog prompt opens. The user name and email address can be changed in the Merge Branch dialog.

When you confirm the request (dialog prompt) whether or not you really want to commit, the commits of the currently selected branch are committed to the current branch. The current branch is the one whose status is now in the working directory. (check mark in the Current column)

If conflicts or relationship issues occur while merging, then they have to be resolved first. Depending on the case and the set merge options in the Branches view, automated actions will run or manual actions are necessary. If a conflict cannot be resolved automatically, then this is indicated in the Status & Staging view. For conflict resolution in the first step, pay attention to the context menu commands provided in the Status & Staging view.

As long as the merge operation has not been completed, the status info Merging is displayed in the header of the view as well as in the taskbar.

The Merge action requires the name and email address of the user. This information is taken from the Git Project Settings. If this is not possible, then a dialog prompt opens.

Upstream: Set/Clear

git push -u origin local-branch

git branch --set-upstream-to <origin/remote-branch>

Opens the Set upstream remote for Branch dialog

Here a branch corresponding to the local branch is created and the link with it set up on the linked remote repository (usually named "origin" and located on a server, for example).

Track branch

git branch --track

Opens the Track a remote branch dialog

Here the local branch can be linked with an available representative of a remote repository (remote branch). This allows for an exchange of commits (Git operations Pull and Push) between the local repository and remote repository.

Pull

(git pull)

Pull with options

The status of the tracked remote repository branch is fetched in the local branch (git fetch) and also merged with it (git merge). Requirement: The local branch tracks the remote branch of the remote repository.

The Pull action requires the name and email address of the user. This information is taken from the credentials stored on the computer. If this is not possible, then they are queried again in the Git pull <remote branch> dialog. For more information about the credentials for a remote repository, see: Credentials needed

The Pull with options command explicitly opens this dialog so that settings can be edited. If the Remember me option is enabled for the Name and Email credentials, then the settings from the dialog are saved in the Git configuration file .git/config in the local repository.

Push

(git push)

If the selected branch is not a tracking branch, then the Push Branch dialog opens. Here you specify the remote branch to be merged into. The commits of the local branch are pushed to the corresponding branch in the remote repository.

If the selected branch is a tracking branch, then the action is performed immediately. No dialog opens.

Compare

The selected branch is compared with the last state of the project in the project storage and the differences are displayed in the comparison view.

When two branches are selected, they are compared.

Filter branches: Local|Remote

By clicking the Local (<n>) and/or Remote (<n>) buttons, the display of local branches and/or remote branches ("representatives" of the branches located in the remote repository) is enabled or disabled in the table.

Table

Current: : This is the local branch where work is currently being done. The Checkout operation is used to make a branch the current one. The working directory (Git repository) contains exact current the status of this branch.

Remote: : This is a "remote branch" located in the remote repository. The entry here is used as a representative of this branch (for example, origin/master as the representative branch of the remote repository).

Tracking: : The local branch tracks a remote branch, and is therefore linked with it for the exchange of commits using Git operations.

Name: Name of the branch

Canonical name: Unique name of the branch

Example: refs/heads/master

Remote: Name of the remote repository which the remote branch references (usually origin)

Upstream branch canonical name

Example: refs/heads/master

Tracked branch name: Name of the remote branch which is tracked

Example: origin/master

Tracked branch canonical name: Canonical name of the remote branch which is tracked. Example: remotes/origin/master

When a branch tracks a remote branch, the following information is relevant. Attention: This display is refreshed only when a Fetch command is executed:

Commits ahead: Number of commits on the local (tracking) branch with which its time is "ahead" of the remote branch

Commits behind: Number of commits which the local (tracking) branch is behind the remote branch.