diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 00:11:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 00:11:09 +0300 |
| commit | 11b7785066d3e81916cbf653f4eb6568148f7e01 (patch) | |
| tree | d4e66091e1cbef57db10d2c9c16cd98106e9a633 /doc/ci/troubleshooting.md | |
| parent | 69f0d90aad454a2b8f3c4e2f2ca31886a14a8642 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/troubleshooting.md')
| -rw-r--r-- | doc/ci/troubleshooting.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/troubleshooting.md b/doc/ci/troubleshooting.md index 0f57a8e00e2..d4b9282ac38 100644 --- a/doc/ci/troubleshooting.md +++ b/doc/ci/troubleshooting.md @@ -164,7 +164,7 @@ a branch to its remote repository. To illustrate the problem, suppose you've had 1. A user creates a feature branch named `example` and pushes it to a remote repository. 1. A new pipeline starts running on the `example` branch. -1. A user rebases the `example` branch on the latest `master` branch and force-pushes it to its remote repository. +1. A user rebases the `example` branch on the latest default branch and force-pushes it to its remote repository. 1. A new pipeline starts running on the `example` branch again, however, the previous pipeline (2) fails because of `fatal: reference is not a tree:` error. |