Skip to content
Snippets Groups Projects
Commit f629203b authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Minor changes to slides

parent 435c406b
No related branches found
No related tags found
No related merge requests found
...@@ -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
......
...@@ -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/ee/gitlab-basics/add-merge-request.html](https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html). Detailed information is [docs.gitlab.com/ce/gitlab-basics/add-merge-request.html](https://docs.gitlab.com/ce/gitlab-basics/add-merge-request.html).
1. Click on **New merge request** 1. Click on **New merge request**
![alt text](https://docs.gitlab.com/ee/gitlab-basics/img/merge_request_new.png "New Merge Request") ![New Merge Request](https://docs.gitlab.com/ee/gitlab-basics/img/merge_request_new.png)
<br><br> <br><br>
2. Compare the branches 2. Compare the branches
![alt text](https://docs.gitlab.com/ee/gitlab-basics/img/merge_request_select_branch.png "Compare branches") ![Compare branches](https://docs.gitlab.com/ee/gitlab-basics/img/merge_request_select_branch.png)
<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**
![alt text](https://help.github.com/assets/images/help/pull_requests/pull-request-start-review-button.png "New pull request") ![New pull request](https://help.github.com/assets/images/help/pull_requests/pull-request-start-review-button.png)
<br><br> <br><br>
2. Compare the branches 2. Compare the branches
![alt text](https://help.github.com/assets/images/help/pull_requests/choose-base-and-compare-branches.png "Compare branches") ![Compare branches](https://help.github.com/assets/images/help/pull_requests/choose-base-and-compare-branches.png)
<ol start="3"> <ol start="3">
<li>Submit the MR <li>Submit the PR
![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>
...@@ -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 GitHub ![Fork the repo](https://help.github.com/assets/images/help/repository/fork_button.jpg)
## Clone your fork ## Clone your fork
......
...@@ -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)
...@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment