Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
courses
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
R3
school
courses
Commits
f629203b
Commit
f629203b
authored
8 years ago
by
Laurent Heirendt
Browse files
Options
Downloads
Patches
Plain Diff
Minor changes to slides
parent
435c406b
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
best_practices.md
+1
-0
1 addition, 0 deletions
best_practices.md
branches.md
+12
-15
12 additions, 15 deletions
branches.md
forks.md
+3
-2
3 additions, 2 deletions
forks.md
github_gitlab.md
+5
-2
5 additions, 2 deletions
github_gitlab.md
installation.md
+1
-1
1 addition, 1 deletion
installation.md
with
22 additions
and
20 deletions
best_practices.md
+
1
−
0
View file @
f629203b
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
*
`pull`
before
`push`
*
`pull`
before
`push`
*
Work on your
**own**
branch (in your own fork)
*
Work on your
**own**
branch (in your own fork)
*
Do
**not**
`push`
to
`master`
or
`develop`
(submit PR)
*
Do
**not**
`push`
to
`master`
or
`develop`
(submit PR)
*
Get your code reviewed by submitted a PR
*
Do
**not**
combine
`git`
commands
*
Do
**not**
combine
`git`
commands
```
sh
```
sh
$
git commit
-am
"myMessage"
# do not do this
$
git commit
-am
"myMessage"
# do not do this
...
...
This diff is collapsed.
Click to expand it.
branches.md
+
12
−
15
View file @
f629203b
...
@@ -51,16 +51,13 @@ Only difference: you are on your own branch.
...
@@ -51,16 +51,13 @@ Only difference: you are on your own branch.
## Merge a branch
## Merge a branch
If you want your feature on the
`develop`
or
`master`
branches, merge!
If you want your feature on the
`develop`
or
`master`
branches,
**submit a MR or a PR**
via the Github/Gitlab interface.
**submit a MR or a PR**
via the Github/Gitlab interface.
<br>
Use the
**interface**
to make use of your peers to review your code!
<img
src=
"img/branch-merge.png"
class=
"branch-merge"
/>
<img
src=
"img/branch-merge.png"
class=
"branch-merge"
/>
<div
class=
"fragment"
>
**ADVANCED**
: You can see the differences between branches
```
sh
$
git diff master..matrix_vect_mult_myName
```
<br>
<br>
You can delete the branch via the interface.
You can delete the branch via the interface.
...
@@ -68,21 +65,21 @@ You can delete the branch via the interface.
...
@@ -68,21 +65,21 @@ You can delete the branch via the interface.
## Gitlab interface
## Gitlab interface
Detailed information is
[
docs.gitlab.com/
e
e/gitlab-basics/add-merge-request.html
](
https://docs.gitlab.com/
e
e/gitlab-basics/add-merge-request.html
)
.
Detailed information is
[
docs.gitlab.com/
c
e/gitlab-basics/add-merge-request.html
](
https://docs.gitlab.com/
c
e/gitlab-basics/add-merge-request.html
)
.
1.
Click on
**New merge request**
1.
Click on
**New merge request**


<br><br>
<br><br>
2.
Compare the branches
2.
Compare the branches


<ol
start=
"3"
>
<ol
start=
"3"
>
<li>
Submit the MR
<li>
Submit the MR
!
[
alt text
](
https://docs.gitlab.com/ee/gitlab-basics/img/merge_request_page.png
"Submit MR"
)
</li>
!
[
Submit MR
](
https://docs.gitlab.com/ee/gitlab-basics/img/merge_request_page.png
)
</li>
</ol>
</ol>
...
@@ -92,15 +89,15 @@ Detailed information is [help.github.com/articles/creating-a-pull-request/](http
...
@@ -92,15 +89,15 @@ Detailed information is [help.github.com/articles/creating-a-pull-request/](http
1.
Click on
**New pull request**
1.
Click on
**New pull request**


<br><br>
<br><br>
2.
Compare the branches
2.
Compare the branches


<ol
start=
"3"
>
<ol
start=
"3"
>
<li>
Submit the
M
R
<li>
Submit the
P
R
!
[
alt text
](
https://help.github.com/assets/images/help/pull_requests/pullrequest-send.png
"Submit MR"
)
</li>
!
[
Submit MR
](
https://help.github.com/assets/images/help/pull_requests/pullrequest-send.png
)
</li>
</ol>
</ol>
This diff is collapsed.
Click to expand it.
forks.md
+
3
−
2
View file @
f629203b
...
@@ -9,10 +9,11 @@ Remember:
...
@@ -9,10 +9,11 @@ Remember:
-
A
**fork**
is not a
**branch**
, but can have multiple
**branches**
.
-
A
**fork**
is not a
**branch**
, but can have multiple
**branches**
.
## Fork
on GitLab
## Fork
via interface
Browse to the original repository and click on the button
`Fork`
:
##
Fork
on G
it
H
ub

## Clone your fork
## Clone your fork
...
...
This diff is collapsed.
Click to expand it.
github_gitlab.md
+
5
−
2
View file @
f629203b
...
@@ -7,7 +7,10 @@ GitHub is **public**, whereas GitLab is **restricted/private**.
...
@@ -7,7 +7,10 @@ GitHub is **public**, whereas GitLab is **restricted/private**.
Positive point: GitHub and GitLab are (almost) the same.
Positive point: GitHub and GitLab are (almost) the same.
## GitHub
## GitHub
(Live Demo)
## GitLab
## GitLab (Live Demo)
## Open an issue (Live Demo)
This diff is collapsed.
Click to expand it.
installation.md
+
1
−
1
View file @
f629203b
...
@@ -55,7 +55,7 @@ $ git --version
...
@@ -55,7 +55,7 @@ $ git --version
Test whether your username and email have been registered
Test whether your username and email have been registered
```
sh
```
sh
$
git config
-
l
$
git config
-
-list
```
```
<br>
<br>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment