Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
a2763809
Commit
a2763809
authored
Feb 02, 2019
by
Marcel Amirault
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix more mirroring refs
parent
d4255d08
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
doc/workflow/repository_mirroring.md
doc/workflow/repository_mirroring.md
+5
-5
No files found.
doc/workflow/repository_mirroring.md
View file @
a2763809
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment