diff options
Diffstat (limited to 'doc/user/project/merge_requests/resolve_conflicts.md')
| -rw-r--r-- | doc/user/project/merge_requests/resolve_conflicts.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/resolve_conflicts.md b/doc/user/project/merge_requests/resolve_conflicts.md index 6a0f2d18629..3ae60d0cf55 100644 --- a/doc/user/project/merge_requests/resolve_conflicts.md +++ b/doc/user/project/merge_requests/resolve_conflicts.md @@ -28,7 +28,7 @@ build. ## Resolve conflicts: interactive mode -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5479) in GitLab 8.11. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/5479) in GitLab 8.11. Clicking this will show a list of files with conflicts, with conflict sections highlighted: @@ -43,7 +43,7 @@ this is similar to performing `git checkout feature; git merge master` locally. ## Resolve conflicts: inline editor -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6374) in GitLab 8.13. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/6374) in GitLab 8.13. The merge conflict resolution editor allows for more complex merge conflicts, which require the user to manually modify a file in order to resolve a conflict, |