[Other doc versions]
Stash uses a 'branching model' to define the branch workflow for each repository. As a project administrator, configuring the model lets you:
The naming convention simply adds prefixes to branch names, so that branches of the same type get the same prefix.
To configure the branching model for a repository, go to Settings > Branching model for the repository and click Enable branching model. Note that for new repositories, the branching model is enabled by default, and uses the default branch prefixes.
Stash makes a number of branch types available, as described below. Use the checkboxes to enable just those branch types that map to your workflow. Note that several branch types have default branch naming prefixes (for example the default prefix for the 'feature' branch type is
feature/), as shown:
You can create a new branch when in JIRA (version 6.1 and above) or in Stash. Either way, you can override the settings that Stash suggests for the repository, branch type, branching point and branch name.
JIRA must be connected with Stash by an application link for this functionality to be available.
When viewing an issue in JIRA of JIRA Agile, click Create Branch (under 'Development' – you'll need the 'View Development Tools' project permission in JIRA to see this):
Choose the SCM, if more than one is available, where you want to create the branch:
Stash suggests the Branch type and Branch name based on the JIRA issue type and summary. Change the settings suggested by Stash, if necessary:
In Stash, choose Create branch from the Actions menu when viewing the Files, Commits or Branches tabs, or when viewing a particular branch.
Stash suggests the Branch type and Branch name based on the JIRA issue type and summary. Notice that Stash displays the current build status beside the source branch picker. Change the settings suggested by Stash if necessary:
You can specify:
Note that Stash suggests a Branch type based on the JIRA issue type, when a branching model is configured. The mapping is:
|JIRA issue type||Stash branch type|
Once the new branch is created, Stash takes you to the file listing for that. You can now pull to your local repository and switch to the new branch.
If Stash cannot perform an automatic merge, perhaps because branch permissions prevent it, Stash creates a new pull request for that merge, and the automatic merge operation stops, This allows you to resolve the conflict locally before approving the new pull request, which may involve further cascading merges.
See Automatic branch merging for more information about the conditions for automatic merging, and how Stash determines the ordering of branches.
The branch listing page makes it easy to keep track of all the branches in your repository.
You can easily find branches by using the search at the top of the table. Furthermore, if you're using the Stash branch model, you can filter by branch type simply by searching for the prefix – for example, search for "feature/" to see all your feature branches.
You can find the feature and bugfix branches that haven't yet been merged into a particular release (for example, "release/2.10") by changing the 'base branch' – just use the branch selector (arrowed in the screenshot below) to change the base branch, and refer to the Behind/Ahead and Pull requests columns.
The Behind/Ahead column shows by how many commits a branch has diverged from the 'base branch' (for example,
master). Use the branch selector (arrowed in the screenshot below) to change the base branch.
The Pull requests column shows the most relevant status from the pull requests against each branch – click an icon to see details. The status is:
If you have an integrated build server, the Builds column shows the status of the latest build results published to Stash. The overall status is 'passed' if all the different builds (for example, unit tests, functional tests, deploy to staging) succeeded and 'failed' if at least one run failed for any of those. Click an icon to see details of the builds.
The Actions menus include tasks for working with branches:
Choose Keyboard shortcuts from the Stash Help menu to see shortcuts to help you navigate quickly around the branch listing.
The branch listing allows you to: