diff --git a/css/style.css b/css/style.css index 05ae57b0bc9d2624b36338545f73fb14d8b02e01..778eee3af854c6cc2d2efbdb2aaed12020d584b3 100644 --- a/css/style.css +++ b/css/style.css @@ -21,7 +21,7 @@ margin: 10px 0px; background: rgba(255, 255, 255, 0.12); border: 0px solid #000; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.15); + box-shadow: 0 0 0px rgba(0, 0, 0, 0.15); -webkit-transition: all .2s linear; -moz-transition: all .2s linear; -ms-transition: all .2s linear; diff --git a/slides/branches.md b/slides/branches.md index 69f185de3ba65198c896886d08cdf6888819e2d9..4cf120ff7cf7a69aa35ba99f3c1747ff84b3f64b 100644 --- a/slides/branches.md +++ b/slides/branches.md @@ -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 diff --git a/slides/essential_commands.md b/slides/essential_commands.md index f1e3117782c2eaebcfa83488870938a4aecc5424..2b29de7d5970cbee547b59515fcbca1e1eb51d93 100644 --- a/slides/essential_commands.md +++ b/slides/essential_commands.md @@ -95,7 +95,7 @@ $ git pull ``` -## Push your file to the folder +## Push your file to the repository ```sh $ git push