Commit 6d633a7f authored by Sean McGivern's avatar Sean McGivern

Merge branch 'git-rerere-link-doc-update' into 'master'

Update git rerere link in docs

See merge request gitlab-org/gitlab-ce!21060
parents b211f7c2 7a56f0e9
---
title: Update git rerere link in docs
merge_request: 21060
author: gfyoung
type: other
...@@ -100,7 +100,7 @@ Notes: ...@@ -100,7 +100,7 @@ Notes:
number of times you have to resolve conflicts. number of times you have to resolve conflicts.
- Please remember to - Please remember to
[always have your EE merge request merged before the CE version](#always-merge-ee-merge-requests-before-their-ce-counterparts). [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. to avoid resolving the same conflicts multiple times.
### Cherry-picking from CE to EE ### Cherry-picking from CE to EE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment