@@ -124,7 +124,7 @@ otherwise pipelines for merged results won't run and your merge requests will be
## Merge Trains **[PREMIUM]**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/9186) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.0.
> This feature is disabled by default until we resolve issues with [contention handling](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222), but [can be enabled manually](#enabling-merge-trains).
> This feature is disabled by default, but [can be enabled manually](#enabling-merge-trains). Please be aware of [current limitations](#merge-trains-limitations).
[Pipelines for merged results](#pipelines-for-merged-results-premium) introduces
running a build on the result of the merged code prior to merging, as a way to keep master green.
...
...
@@ -143,8 +143,7 @@ it creates a new pipeline targeting the merge result of the previous MR plus the
Pipelines invalidated through failures are immediately canceled and requeued.
CAUTION: **Warning:**
At this moment, each merge train can generate a merge ref and run a pipeline **one at a time** due to a technical challenge.
We have [an issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) to tackle this problem to make the pipelines for merged results run in parallel.
At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release.
### Enabling Merge Trains
...
...
@@ -188,8 +187,7 @@ button while the latest pipeline is running.
### Merge Train's limitations
- At this moment, each merge train can generate a merge ref and run a pipeline **one at a time** due to a technical challenge.
We have [an issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) to tackle this problem to make the pipelines for merged results run in parallel.
- At the moment, each merge train can generate a merge ref and run a pipeline **one at a time**. We plan to make the pipelines for merged results [run in parallel](https://gitlab.com/gitlab-org/gitlab-ee/issues/11222) in a future release.
