diff options
| author | Sean Packham <seanpackham@gitlab.com> | 2016-09-28 09:14:22 +0100 |
|---|---|---|
| committer | Sean Packham <seanpackham@gitlab.com> | 2016-09-28 09:14:22 +0100 |
| commit | 5608daa113a92258509a08c6fc0f059a02681d3d (patch) | |
| tree | 31b99ab08bcf8d7100757c79eac514f12b2d718b /doc/university | |
| parent | 3ba13d545ea5e4869919bb50ca2d890a2c18089a (diff) | |
| download | gitlab-ce-5608daa113a92258509a08c6fc0f059a02681d3d.tar.gz | |
Resolve merge request commentsadd-university-content
Diffstat (limited to 'doc/university')
| -rw-r--r-- | doc/university/training/end-user/README.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md index d1976833ec1..03c62a81b10 100644 --- a/doc/university/training/end-user/README.md +++ b/doc/university/training/end-user/README.md @@ -139,13 +139,13 @@ cd ~/workspace - Sign in into your gitlab.com account - Create a project - Choose to import from 'Any Repo by URL' and use https://gitlab.com/gitlab-org/training-examples.git -- On your machine clone the 'training-examples' project +- On your machine clone the `training-examples` project --- ### Git and GitLab basics -1. Edit 'edit_this_file.rb' in 'training-examples' +1. Edit `edit_this_file.rb` in `training-examples` 2. See it listed as a changed file (working area) 3. View the differences 4. Stage the file @@ -169,8 +169,8 @@ git log ### Feature Branching -1. Create a new feature branch called 'squash_some_bugs' -2. Edit 'bugs.rb' and remove all the bugs. +1. Create a new feature branch called `squash_some_bugs` +2. Edit `bugs.rb` and remove all the bugs. 3. Commit 4. Push @@ -196,7 +196,7 @@ git push origin squash_some_bugs - When you want feedback create a merge request - Target is the ‘default’ branch (usually master) - Assign or mention the person you would like to review -- Add 'WIP' to the title if it's a work in progress +- Add `WIP` to the title if it's a work in progress - When accepting, always delete the branch - Anyone can comment, not just the assignee - Push corrections to the same branch |