diff --git a/branches.md b/branches.md index 79e02c90cba2c224fc8a8629b3f9f290f986436f..16ab200cb5f3db367ef6c40e8a1eafb02308bc15 100644 --- a/branches.md +++ b/branches.md @@ -49,14 +49,11 @@ Only difference: you are on your own branch. ## Merge a branch -If you want your feature on the `develop` or `master` branches, merge your branch with the -`develop` or `master` or 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. -<!-- PICTURES HERE //--> - <div class="fragment"> <br> **ADVANCED**: You can see the differences between branches @@ -66,3 +63,26 @@ $ git diff master..matrix_vect_mult_myName <br> You can delete the branch via the interface. + + +## Gitlab interface + +Detailed information is [docs.gitlab.com/ee/gitlab-basics/add-merge-request.html](https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html). + +1. Click on **New merge request** + + +<br><br> +2. Compare the branches + + + + +<ol start="3"> + <li>Submit the MR + + /li> +</ol> + + +## Github interface diff --git a/good_practices.md b/good_practices.md index 2fc2ca0756f5c19e634620f94a734e14412c654f..e207fb534ea9eba85a810a512c02a39bd9d3b970 100644 --- a/good_practices.md +++ b/good_practices.md @@ -1,27 +1,29 @@ ## Good practices -1. `clone` a repository, do not download the `.zip` file. -2. `pull` before `push` -3. Work on your **own** branch (in your own fork) -4. Do **not** `push` to `master` or `develop` (submit PR) -5. Do **not** combine `git` commands +* `clone` a repository, do not download the `.zip` file. +* `pull` before `push` +* Work on your **own** branch (in your own fork) +* Do **not** `push` to `master` or `develop` (submit PR) +* Do **not** combine `git` commands ```sh $ git commit -am "myMessage" # do not do this ``` -6. Stage only 1 file at once using +* Stage only 1 file at once using ```sh $ git add myFile.txt ``` -7. Commit only a few files at once -8. Submit a PR instead of pushing directly -9. Always sync your fork before starting to work + + +* Commit only a few files at once +* Submit a PR instead of pushing directly +* Always sync your fork before starting to work ```sh $ git remote -v # verify to have the right remote set $ git fetch upstream $ git merge upstream/master $ git push origin master # do not do git push (!) ``` -10. `Push` often - avoid conflicts +* `Push` often - avoid conflicts <br><br> **A `push` a day keeps the conflict away** diff --git a/installation.md b/installation.md index a2a982d1eae2de3db84c62c52ff08ce43aad9083..deff9b919f26417ff6ac6c38f76df4a7e01856bc 100644 --- a/installation.md +++ b/installation.md @@ -1,6 +1,6 @@ ## Installation -<img src="img/github_app.png" class="as-is" height="300" /> +<img src="img/github_app.png" class="as-is" height="200" /> **Linux (Ubuntu)** diff --git a/the_terminal.md b/the_terminal.md index a0bdfadaa884ffc560ac2e9b1315320218d106fd..23ebb3f0d5632c6930847a1bccaf1d0ba586a620 100644 --- a/the_terminal.md +++ b/the_terminal.md @@ -19,7 +19,6 @@ in your home directory, denoted as `~/`. ## Essential Linux commands -<div class="fragment"> List the contents of a directory ```sh $ ls @@ -40,7 +39,7 @@ $ cd .. $ cd ../.. ``` -<div class="fragment"> + <br> Create a directory ```sh