BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5608daa1
Commit
5608daa1
authored
Sep 28, 2016
by
Sean Packham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve merge request comments
parent
3ba13d54
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
README.md
doc/university/training/end-user/README.md
+5
-5
No files found.
doc/university/training/end-user/README.md
View file @
5608daa1
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment