Commit 8c0e358a authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs/conflict-editor' into 'master'

Add docs for resolve conflicts editor

See merge request !8748
parents c66c3a46 b72f43d0
...@@ -21,6 +21,18 @@ request into the source branch, resolving the conflicts using the options ...@@ -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`, 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. 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 ## Conflicts available for resolution
GitLab allows resolving conflicts in a file where all of the below are true: GitLab allows resolving conflicts in a file where all of the below are true:
......
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