Commit 69ab641c authored by Fiona Neill's avatar Fiona Neill

Merge branch 'aqualls-update-links' into 'master'

Update redirect file to correct location

See merge request gitlab-org/gitlab!73558
parents ff568d09 21d22144
...@@ -47,7 +47,7 @@ Projects include the following [features](https://about.gitlab.com/features/): ...@@ -47,7 +47,7 @@ Projects include the following [features](https://about.gitlab.com/features/):
strategy and get reviewed by your team. strategy and get reviewed by your team.
- [Merge Request Approvals](merge_requests/approvals/index.md): Ask for approval before - [Merge Request Approvals](merge_requests/approvals/index.md): Ask for approval before
implementing a change. implementing a change.
- [Fix merge conflicts from the UI](merge_requests/resolve_conflicts.md): View Git diffs from the GitLab UI. - [Fix merge conflicts from the UI](merge_requests/conflicts.md): View Git diffs from the GitLab UI.
- [Review Apps](../../ci/review_apps/index.md): By branch, preview the results - [Review Apps](../../ci/review_apps/index.md): By branch, preview the results
of the changes proposed in a merge request. of the changes proposed in a merge request.
- [Labels](labels.md): Organize issues and merge requests by labels. - [Labels](labels.md): Organize issues and merge requests by labels.
......
...@@ -3,7 +3,7 @@ redirect_to: 'conflicts.md' ...@@ -3,7 +3,7 @@ redirect_to: 'conflicts.md'
remove_date: '2022-01-26' remove_date: '2022-01-26'
--- ---
This document was moved to [another location](../path/to/file/index.md). This document was moved to [another location](conflicts.md).
<!-- This redirect file can be deleted after <2022-01-26>. --> <!-- This redirect file can be deleted after <2022-01-26>. -->
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> <!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
\ No newline at end of file
...@@ -211,7 +211,7 @@ These features are associated with merge requests: ...@@ -211,7 +211,7 @@ These features are associated with merge requests:
When viewing the commit details page, GitLab links to the merge request(s) containing that commit. When viewing the commit details page, GitLab links to the merge request(s) containing that commit.
- [Merge requests versions](../versions.md): - [Merge requests versions](../versions.md):
Select and compare the different versions of merge request diffs Select and compare the different versions of merge request diffs
- [Resolve conflicts](../resolve_conflicts.md): - [Resolve conflicts](../conflicts.md):
GitLab can provide the option to resolve certain merge request conflicts in the GitLab UI. GitLab can provide the option to resolve certain merge request conflicts in the GitLab UI.
- [Revert changes](../revert_changes.md): - [Revert changes](../revert_changes.md):
Revert changes from any commit from a merge request. Revert changes from any commit from a merge request.
......
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