diff options
| author | Nick Kipling <nkipling@gitlab.com> | 2019-06-11 10:39:12 +0100 |
|---|---|---|
| committer | Nick Kipling <nkipling@gitlab.com> | 2019-06-11 10:39:12 +0100 |
| commit | 2477678197eae927aa9a3eb22115da96d81b9fd5 (patch) | |
| tree | de5f3612259a6d7f03122bff351fa09b49bfe8e0 /doc/university/training/topics/merge_conflicts.md | |
| parent | 5252d9bf75e4eabc273f85aaba87334b0da52d83 (diff) | |
| parent | 9749a25f02f2c0a1d33460bff4c5205328577caa (diff) | |
| download | gitlab-ce-2477678197eae927aa9a3eb22115da96d81b9fd5.tar.gz | |
Merge branch '35428-docker-registry-date-not-accurate' of gitlab.com:gitlab-org/gitlab-ce into 35428-docker-registry-date-not-accurate35428-docker-registry-date-not-accurate
Diffstat (limited to 'doc/university/training/topics/merge_conflicts.md')
| -rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index a7d42904229..dd235fe3a81 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -4,15 +4,11 @@ comments: false # Merge conflicts ----------- - - Happen often - Learning to fix conflicts is hard - Practice makes perfect - Force push after fixing conflicts. Be careful! ----------- - ## Merge conflicts 1. Checkout a new branch and edit `conflicts.rb`. Add 'Line4' and 'Line5'. @@ -26,11 +22,9 @@ comments: false 1. Force push the changes. 1. Finally continue with the Merge Request. ----------- - ## Commands -``` +```sh git checkout -b conflicts_branch # vi conflicts.rb @@ -49,7 +43,7 @@ git push origin master Create a merge request on the GitLab web UI. You'll see a conflict warning. -``` +```sh git checkout conflicts_branch git fetch git rebase master @@ -65,7 +59,6 @@ git rebase --continue # need to force push so that our remote branch is restructured git push origin conflicts_branch -f ``` ----------- ## Note |