diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-11 12:41:46 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-21 11:36:54 -0700 |
| commit | 06a2e3854e383fd8ae042af182c54f5d607f2302 (patch) | |
| tree | cfb49e52984eff309cb022a2206ece3c31c873c7 /doc/user/project | |
| parent | c6f72ac9a88521257991aa9a0cc6d558126f5bb9 (diff) | |
| download | gitlab-ce-06a2e3854e383fd8ae042af182c54f5d607f2302.tar.gz | |
Make it explicit that merge conflict feature commits to source branch
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.  |