diff options
| author | Marcel Amirault <ravlen@gmail.com> | 2019-02-02 06:57:31 +0000 |
|---|---|---|
| committer | Marcel Amirault <ravlen@gmail.com> | 2019-02-02 06:57:31 +0000 |
| commit | a2763809a34e3e78a5472b8084d52efbb14a08b4 (patch) | |
| tree | f4d9e167c2a005a2f23107d12fb22ccd9b629e70 /doc/workflow | |
| parent | d4255d08dcbe346ef6e35d3ea289b8cecec08c94 (diff) | |
| download | gitlab-ce-a2763809a34e3e78a5472b8084d52efbb14a08b4.tar.gz | |
Fix more mirroring refs
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/repository_mirroring.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/workflow/repository_mirroring.md b/doc/workflow/repository_mirroring.md index ac26aeab137..1213474b7d8 100644 --- a/doc/workflow/repository_mirroring.md +++ b/doc/workflow/repository_mirroring.md @@ -55,7 +55,7 @@ When push mirroring is enabled, only push commits directly to the mirrored repos mirror diverging. All changes will end up in the mirrored repository whenever: - Commits are pushed to GitLab. -- A [forced update](#forcing-an-update) is initiated. +- A [forced update](#forcing-an-update-core) is initiated. Changes pushed to files in the repository are automatically pushed to the remote mirror at least: @@ -122,7 +122,7 @@ directly to the repository on GitLab. Instead, any commits should be pushed to t Changes pushed to the upstream repository will be pulled into the GitLab repository, either: - Automatically within a certain period of time. -- When a [forced update](#forcing-an-update) is initiated. +- When a [forced update](#forcing-an-update-core) is initiated. CAUTION: **Caution:** If you do manually update a branch in the GitLab repository, the branch will become diverged from @@ -259,7 +259,7 @@ failed. This will become visible in either the: - Pull mirror settings page. When a project is hard failed, it will no longer get picked up for mirroring. A user can resume the -project mirroring again by [Forcing an update](#forcing-an-update). +project mirroring again by [Forcing an update](#forcing-an-update-core). ### Trigger update using API **[STARTER]** @@ -292,8 +292,8 @@ them and how they will be resolved. Rewriting any mirrored commit on either remote will cause conflicts and mirroring to fail. This can be prevented by: -- [Pulling only protected branches](#pull-only-protected-branches). -- [Pushing only protected branches](#push-only-protected-branches). +- [Pulling only protected branches](#only-mirror-protected-branches-starter). +- [Pushing only protected branches](#push-only-protected-branches-core). You should [protect the branches](../user/project/protected_branches.md) you wish to mirror on both remotes to prevent conflicts caused by rewriting history. |