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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7a56f0e9
Commit
7a56f0e9
authored
Aug 07, 2018
by
gfyoung
Committed by
gfyoung
Aug 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update git rerere link in docs
The original link was moved.
parent
b211f7c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/git-rerere-link-doc-update.yml
changelogs/unreleased/git-rerere-link-doc-update.yml
+5
-0
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+1
-1
No files found.
changelogs/unreleased/git-rerere-link-doc-update.yml
0 → 100644
View file @
7a56f0e9
---
title
:
Update git rerere link in docs
merge_request
:
21060
author
:
gfyoung
type
:
other
doc/development/automatic_ce_ee_merge.md
View file @
7a56f0e9
...
...
@@ -100,7 +100,7 @@ Notes:
number of times you have to resolve conflicts.
-
Please remember to
[
always have your EE merge request merged before the CE version
](
#always-merge-ee-merge-requests-before-their-ce-counterparts
)
.
-
You can use
[
`git rerere`
](
https://git-scm.com/
blog/2010/03/08/rerere.html
)
-
You can use
[
`git rerere`
](
https://git-scm.com/
docs/git-rerere
)
to avoid resolving the same conflicts multiple times.
### Cherry-picking from CE to EE
...
...
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