Commit 0f467433 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Added content for branches slides

parent 809cd62a
......@@ -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
......
......@@ -95,7 +95,7 @@ $ git pull
```
## Push your file to the folder
## Push your file to the repository
```sh
$ git push
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment