diff options
Diffstat (limited to 'doc/topics/git/merge_conflicts.md')
| -rw-r--r-- | doc/topics/git/merge_conflicts.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/topics/git/merge_conflicts.md b/doc/topics/git/merge_conflicts.md index bf69190030c..47276ccb0b2 100644 --- a/doc/topics/git/merge_conflicts.md +++ b/doc/topics/git/merge_conflicts.md @@ -23,7 +23,7 @@ comments: false 1. Fix conflicts on the `conflicts.rb` file. 1. Stage the file and continue rebasing. 1. Force push the changes. -1. Finally continue with the Merge Request. +1. Finally continue with the merge request. ```shell git checkout -b conflicts_branch |