Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 09:06:40 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 09:06:40 +0300
commit688e33953d34ab8cd348d02ce79d8fdfe5353a03 (patch)
treeee102361fc8a5bf5b2f4b05ca79ccef27b5c3102 /doc/ci/merge_request_pipelines
parent91f027ede40879af0bce406f2872e8d35c01e334 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/merge_request_pipelines')
-rw-r--r--doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
index 3a0848fcd08..379644beacd 100644
--- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
+++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
@@ -96,7 +96,7 @@ To check these feature flag values, please ask administrator to execute the foll
### Intermittently pipelines fail by `fatal: reference is not a tree:` error
Since pipelines for merged results are a run on a merge ref of a merge request
-(`refs/merge-requests/<iid>/merge`), the git-reference could be overwritten at an
+(`refs/merge-requests/<iid>/merge`), the Git reference could be overwritten at an
unexpected timing, for example, when a source or target branch is advanced.
In this case, the pipeline fails because of `fatal: reference is not a tree:` error,
which indicates that the checkout-SHA is not found in the merge ref.