Actions

Commit

Provides a list of modified files to select and commits the changes to the repository.

• Enter a commit message that briefly describes the changes.

  Comments starting with Git comments such as symbol # or other symbols are automatically removed from the commit message.

• Select Commit to write the selected files to the Git repository.

  Files that you do not select are automatically removed from staging.

See Design Studio settings. We recommend that you do not create backup files using the option on the General settings tab.

Revert

Safely reverts changes to the codebase by restoring modified files to a previous state.

• From the list, select the changes to revert.

• Select Revert to undo the changes.

Design Studio restores the content to the previous version in the working directory and refreshes the project pane.

Push

Pushes committed changes to a remote branch.

If there is no remote branch, Git creates it in the remote repository before pushing the changes.

Log

Displays a list of commits with file change data for each commit.

Select a file to view the changes.

Checkout branch

From a list of available local and remote branches, checks out one branch and makes it the active working branch.

• Select the Local or Remote tab to view the list of branches.

• Select a branch to check out.

  • If you select a local branch, it immediately becomes the current working branch.

    The new local branch uses the same name as the remote branch.

  • If you select a remote branch, Design Studio creates a new local branch that tracks the remote branch.

• Select Checkout.

New Branch

Creates a new branch based on the currently selected and checked-out branch. See Checkout branch.

Enter a name for the new branch.

The branch name must be valid according to Git branch naming conventions: no spaces, special characters, or slashes at the start.

A new branch is created based on the currently checked-out branch. The new branch is automatically checked out, making it the active working branch.

Delete Branch

Deletes a local or remote branch from the list of branches.

In the list of local and remote branches, the currently checked-out branch is omitted.

• Select one or more branches to delete.

  • Local branches are deleted directly from your repository.

  • Remote branches are deleted by pushing a deletion request to the remote repository.

• Select Delete.

Pull

Updates your local repository with changes from a remote repository. This action combines branch, commit, and merge actions.

• If local changes are found, commit them before continuing with the Pull.

• If no tracking branch exists, select a remote branch to pull from.

  The remote branch is set as the tracking branch for future pulls into the local branch.

• If no conflicts are found, the latest changes from the remote branch are merged into the local branch and appear in the project.

• If conflicts are found, see Merge.

When the Pull completes successfully, all new changes from the remote branch are refreshed in the project and any related views.

Merge

Merges a selected branch into the current branch and refreshes the project pane.

Before merging, the system ensures that the project is in a safe state by verifying that all files are saved and all local changes are committed.

To merge:

• If any changes are not saved, commit or discard them before proceeding.

• Select a local or remote branch to merge into the current branch.

  If there are no conflicts, the merge is completed.

• If conflicts are detected, resolve the conflicts or cancel the merge.

To resolve conflicts:

If merge conflicts occur, a Conflicts dialog box appears.

• Select and review the conflicts.

• For each conflict, choose either Keep Local Version or Use Remote Version.

• If the list of files is long, select the up or down icon.

• After you resolve all conflicts, select Remove Conflicts.

If you close the dialog box without resolving all conflicts, the action is canceled. No changes are committed.

Abort Merge

Stops a pending merge operation with unresolved conflicts.

Select Abort Merge when a merge is in progress and conflicts are found that you do not want to commit or resolve at this time.

This action cancels the merge and restores the working directory to its previous state. All uncommitted changes are discarded. The project pane is refreshed to reflect the repository state.

Properties

Provides a shortcut to the Git tab in the Design Studio Settings window. See Git settings.