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
5e06a51c
Commit
5e06a51c
authored
8 years ago
by
Laurent Heirendt
Browse files
Options
Downloads
Patches
Plain Diff
Added content for branches slides
parent
38f51e56
No related branches found
No related tags found
2 merge requests
!18
merge all
,
!11
new images and content for branches slide
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
css/style.css
+1
-1
1 addition, 1 deletion
css/style.css
slides/branches.md
+6
-5
6 additions, 5 deletions
slides/branches.md
slides/essential_commands.md
+1
-1
1 addition, 1 deletion
slides/essential_commands.md
with
8 additions
and
7 deletions
css/style.css
+
1
−
1
View file @
5e06a51c
...
...
@@ -21,7 +21,7 @@
margin
:
10px
0px
;
background
:
rgba
(
255
,
255
,
255
,
0.12
);
border
:
0px
solid
#000
;
box-shadow
:
0
0
5
px
rgba
(
0
,
0
,
0
,
0.15
);
box-shadow
:
0
0
0
px
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-transition
:
all
.2s
linear
;
-moz-transition
:
all
.2s
linear
;
-ms-transition
:
all
.2s
linear
;
...
...
This diff is collapsed.
Click to expand it.
slides/branches.md
+
6
−
5
View file @
5e06a51c
...
...
@@ -3,7 +3,7 @@
Branch-off within the same repository in order to stay safe!
The master branch:
<img
src=
"img/branch-
0-
master.png"
class=
"
as-is
"
/>
<img
src=
"img/branch-master.png"
class=
"
branch-master
"
/>
## One branch per feature
...
...
@@ -14,7 +14,7 @@ $ git checkout -b matrix_vect_mult_myName
```
The
`-b`
flag creates the branch.
<img
src=
"img/branch-
1-checkout-b
.png"
class=
"
as-is
"
/>
<img
src=
"img/branch-
create
.png"
class=
"
branch-create
"
/>
## Switch between branches
...
...
@@ -40,22 +40,23 @@ You can switch back to master with
$
git checkout master
```
<div
class=
"fragment"
>
<br>
You can use the 5 essential commands as before.
Only difference: you are on your own branch.
<img
src=
"img/branch-commit.png"
class=
"branch-commit"
/>
## Merge a branch
If you want your feature on the
`develop`
or
`master`
branches, merge!
<br>
**submit a MR or a PR**
via the Github/Gitlab interface.
<img
src=
"img/branch-merge.png"
class=
"branch-merge"
/>
<div
class=
"fragment"
>
<br>
**ADVANCED**
: You can see the differences between branches
```
sh
$
git diff master..matrix_vect_mult_myName
...
...
This diff is collapsed.
Click to expand it.
slides/essential_commands.md
+
1
−
1
View file @
5e06a51c
...
...
@@ -95,7 +95,7 @@ $ git pull
```
## Push your file to the
folder
## Push your file to the
repository
```
sh
$
git push
...
...
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