diff options
Diffstat (limited to 'doc/university/training/topics/merge_conflicts.md')
-rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index a01b3dbf3e0..e59f9e2bae8 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -22,7 +22,7 @@ comments: false 1. Force push the changes. 1. Finally continue with the Merge Request. -```sh +```shell git checkout -b conflicts_branch # vi conflicts.rb @@ -41,7 +41,7 @@ git push origin master Create a merge request on the GitLab web UI. You'll see a conflict warning. -```sh +```shell git checkout conflicts_branch git fetch git rebase master |