Commit 2257fda3 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Reference the version 'UI resolve conflicts' was introduced

[ci skip]
parent 7cb76ce1
# Merge conflict resolution # Merge conflict resolution
> [Introduced][ce-5479] in GitLab 8.11.
When a merge request has conflicts, GitLab may provide the option to resolve When a merge request has conflicts, GitLab may provide the option to resolve
those conflicts in the GitLab UI. (See those conflicts in the GitLab UI. (See
[conflicts available for resolution](#conflicts-available-for-resolution) for [conflicts available for resolution](#conflicts-available-for-resolution) for
...@@ -35,3 +37,5 @@ Additionally, GitLab does not detect conflicts in renames away from a path. For ...@@ -35,3 +37,5 @@ Additionally, GitLab does not detect conflicts in renames away from a path. For
example, this will not create a conflict: on branch `a`, doing `git mv file1 example, this will not create a conflict: on branch `a`, doing `git mv file1
file2`; on branch `b`, doing `git mv file1 file3`. Instead, both files will be file2`; on branch `b`, doing `git mv file1 file3`. Instead, both files will be
present in the branch after the merge request is merged. present in the branch after the merge request is merged.
[ce-5479]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5479
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