diff --git a/changelogs/unreleased/git-rerere-link-doc-update.yml b/changelogs/unreleased/git-rerere-link-doc-update.yml new file mode 100644 index 0000000000000000000000000000000000000000..06093e8ec13d41254769c2260fa43cd657689fe4 --- /dev/null +++ b/changelogs/unreleased/git-rerere-link-doc-update.yml @@ -0,0 +1,5 @@ +--- +title: Update git rerere link in docs +merge_request: 21060 +author: gfyoung +type: other diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index a85e5b1b1cc394f9bb0b210f4377faa88a83fd6a..8d41503f8745f81ead26e343d9ef28ca5f9c5053 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -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