11 lines
673 B
Markdown
11 lines
673 B
Markdown
---
|
|
redirect_to: '../../user/project/merge_requests/conflicts.md#resolve-conflicts-from-the-command-line'
|
|
remove_date: '2023-02-01'
|
|
---
|
|
|
|
This document was moved to [another location](../../user/project/merge_requests/conflicts.md#resolve-conflicts-from-the-command-line).
|
|
|
|
<!-- This redirect file can be deleted after <2023-02-01>. -->
|
|
<!-- Redirects that point to other docs in the same project expire in three months. -->
|
|
<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
|
|
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
|