diff options
| author | Alex Groleau <agroleau@gitlab.com> | 2019-08-27 12:41:39 -0400 |
|---|---|---|
| committer | Alex Groleau <agroleau@gitlab.com> | 2019-08-27 12:41:39 -0400 |
| commit | aa01f092829facd1044ad02f334422b7dbdc8b0e (patch) | |
| tree | a754bf2497820432df7da0f2108bb7527a8dd7b8 /doc/university/training/topics/merge_conflicts.md | |
| parent | a1d9c9994a9a4d79b824c3fd9322688303ac8b03 (diff) | |
| parent | 6b10779053ff4233c7a64c5ab57754fce63f6710 (diff) | |
| download | gitlab-ce-runner-metrics-extractor.tar.gz | |
Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor
Diffstat (limited to 'doc/university/training/topics/merge_conflicts.md')
| -rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index dd235fe3a81..97bb038f405 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -9,7 +9,7 @@ comments: false - Practice makes perfect - Force push after fixing conflicts. Be careful! -## Merge conflicts +## Merge conflicts sample workflow 1. Checkout a new branch and edit `conflicts.rb`. Add 'Line4' and 'Line5'. 1. Commit and push. @@ -22,8 +22,6 @@ comments: false 1. Force push the changes. 1. Finally continue with the Merge Request. -## Commands - ```sh git checkout -b conflicts_branch |