diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-22 21:08:16 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-22 21:08:16 +0000 |
| commit | 76e276cb433a7023cf8154f9d9555725b3b11e67 (patch) | |
| tree | 1a456a96d5dcdf0abacbfffe4438bad8d515c0f5 /doc/user/project | |
| parent | 4c63e904ec9118f44b83496867d9e3cc0d3082c1 (diff) | |
| parent | add9defa05179865ee5460fd4bbd67cac9e23f53 (diff) | |
| download | gitlab-ce-76e276cb433a7023cf8154f9d9555725b3b11e67.tar.gz | |
Merge branch '44895-explicit-merge-conflict' into 'master'
Resolve "Make explicit that merge conflict feature commits to source branch"
Closes #44895
See merge request gitlab-org/gitlab-ce!18921
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/merge_requests/resolve_conflicts.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/resolve_conflicts.md b/doc/user/project/merge_requests/resolve_conflicts.md index 68c49054e47..ecbc8534eea 100644 --- a/doc/user/project/merge_requests/resolve_conflicts.md +++ b/doc/user/project/merge_requests/resolve_conflicts.md @@ -29,7 +29,7 @@ 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. +**Commit to source branch** button.  |