Progress will discontinue Telerik Platform on May 10th, 2018. Learn more

This section is applicable to the in-browser client, the universal desktop client and the classic Windows desktop client. For information about version control in the extension for Visual Studio, see Use version control in Visual Studio.

When you develop privately or in collaboration, you can use version control to manage and track the development of a task. To contain the development of a new feature or a bug fix separately from your stable version, you can use branches.

The in-browser client, the universal desktop client and the classic Windows desktop client let you create, check out and merge branches for your current repository. You can use branches with the default repository that the built-in version control provides and with your third-party remote repository.

Local and Remote Branches in AppBuilder

AppBuilder distinguishes between local and remote branches.

  • Local branch: A local branch is the branch of your private repository managed by the built-in version control. In the Provider cell, a cloud icon indicates that the branch is local.
    You can work with local branches at any time. If you have configured third-party version control, you need to regularly synchronize your local branch with the remote branch.
  • Remote branch: A remote branch is a branch of the remote repository managed by your third-party Git provider. In the Provider cell, a Git provider-related icon indicates the branch is remote.
    To work with remote branches, you need to configure third-party version control. For more information about third-party version control, see Configuring Third-Party Version Control.

Operations with Branches in AppBuilder

In this version of the in-browser client, the universal desktop client and the classic Windows desktop client, you can perform the following operations with branches.

  • You can create branches.
  • You can check out branches.
  • You can push changes from the currently checked out branch to a remote branch.
  • You can pull changes in the currently checked out branch from a remote branch.
  • You can fast forward merge branches.
  • You can resolve merge conflicts.
  • You can delete branches.
  • You can reset branches.

In this version of the in-browser client, the universal desktop client and the classic Windows desktop client, you cannot perform the following operations with branches.

  • You cannot rebase branches.
  • You cannot stash changes.
  • You cannot squash merge branches.
  • You cannot cherry pick commits when performing branch operations.

In this section, you will find the following resources:

Start a free trial Request a demo
Contact us: +1-888-365-2779
sales@telerik.com
Copyright © 2016-2017, Progress Software Corporation and/or its subsidiaries or affiliates. All rights reserved.