diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-01-24 16:13:38 +0100 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-01-24 17:23:47 +0100 |
commit | b72f43d053ff835726ad82cf9bab220c18209a89 (patch) | |
tree | 297d845b23c924077fa30a06ebb6d315fb6efd5e /doc/user/project/merge_requests | |
parent | c66c3a46b508954fef6de41441d5a30eb3083f85 (diff) | |
download | gitlab-ce-b72f43d053ff835726ad82cf9bab220c18209a89.tar.gz |
Add docs for resolve conflicts editor
[ci skip]
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r-- | doc/user/project/merge_requests/img/merge_conflict_editor.png | bin | 0 -> 50422 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/resolve_conflicts.md | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/merge_conflict_editor.png b/doc/user/project/merge_requests/img/merge_conflict_editor.png Binary files differnew file mode 100644 index 00000000000..6660920c191 --- /dev/null +++ b/doc/user/project/merge_requests/img/merge_conflict_editor.png diff --git a/doc/user/project/merge_requests/resolve_conflicts.md b/doc/user/project/merge_requests/resolve_conflicts.md index 4d7225bd820..68c49054e47 100644 --- a/doc/user/project/merge_requests/resolve_conflicts.md +++ b/doc/user/project/merge_requests/resolve_conflicts.md @@ -21,6 +21,18 @@ request into the source branch, resolving the conflicts using the options chosen. If the source branch is `feature` and the target branch is `master`, this is similar to performing `git checkout feature; git merge master` locally. +## Merge conflict editor + +> Introduced 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, +to be solved right form the GitLab interface. Use the **Edit inline** button +to open the editor. Once you're sure about your changes, hit the +**Commit conflict resolution** button. + +![Merge conflict editor](img/merge_conflict_editor.png) + ## Conflicts available for resolution GitLab allows resolving conflicts in a file where all of the below are true: |