diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-17 15:34:53 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-17 15:34:53 +0300 |
| commit | 2257fda38e37f5aa59a9ef83c6c6cff36bbcb182 (patch) | |
| tree | 624404fdf2de53dc00d94cc219de36bbb0543c85 /doc/user/project/merge_requests | |
| parent | 7cb76ce1c65e9f0b307cc092a1140a744eaa8277 (diff) | |
Reference the version 'UI resolve conflicts' was introduced
[ci skip]
Diffstat (limited to 'doc/user/project/merge_requests')
| -rw-r--r-- | doc/user/project/merge_requests/resolve_conflicts.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/resolve_conflicts.md b/doc/user/project/merge_requests/resolve_conflicts.md index b355d1a01f1..44b76ffc8e6 100644 --- a/doc/user/project/merge_requests/resolve_conflicts.md +++ b/doc/user/project/merge_requests/resolve_conflicts.md @@ -1,5 +1,7 @@ # Merge conflict resolution +> [Introduced][ce-5479] in GitLab 8.11. + When a merge request has conflicts, GitLab may provide the option to resolve those conflicts in the GitLab UI. (See [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 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 present in the branch after the merge request is merged. + +[ce-5479]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5479 |