kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add docs for resolve conflicts editor

Browse source 
[ci skip]
This commit is contained in:
Achilleas Pipinellis 2017-01-24 16:13:38 +01:00
parent c66c3a46b5
commit b72f43d053
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
doc/user/project/merge_requests/img/merge_conflict_editor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 49 KiB

12
doc/user/project/merge_requests/resolve_conflicts.md
View file

@ -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: