The Automatic Merge build feature tracks builds in branches matched by the configured filter and merges them into a specified destination branch if the build satisfies the condition configured (for example, the build is successful).
The feature is supported for Git and Mercurial VCS roots for build configurations with enabled feature branches.
TeamCity also allows merging branches manually.
On this page:
Automatic Merge Settings
Check Adding Build Features for notes on how to add a build feature.
All branches that are used in this feature must be present in a repository and included into the Branch Specification of the current build configuration.
Watch builds in branches
Specify the branches whose builds' sources will be merged. Read more in Branch Filter.
Merge into branch
A logical name of the destination branch the sources will be merged to. Parameter references are supported here. The branch must be present in a repository and included into the Branch Specification.
Merge commit message
A message for a merge commit. The default is set to
Perform merge if
A condition defining when the merge will be performed (either for successful builds only, or if build from the branch does not add new problems to destination branch).
Select to create a merge commit or do a fast-forward merge.
Choose when to merge:
It is possible to define a cascade of merge operations by adding several such build features to a build configuration.
For example, you want to automatically merge all feature branches into an
integration branch, and then configure another merge from the
integration to the default branch. To achieve this, you can add two Automatic Merge build features: one watching
+:feature-* branches and merging into
integration branch and the second watching
+:integration branch and merging into
default branch. The build configuration should then allow for building
See also a related TeamCity blog post.