Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 92305642 authored by MALANDAIN Mathias's avatar MALANDAIN Mathias
Browse files

Change link color + add Mermaid graphs as JPEGs

parent 21e10df4
Branches
No related tags found
No related merge requests found
......@@ -128,17 +128,7 @@ Regarding the way these levels interact, there are a few important things that y
As an illustration, this is a basic flowchart of every operation we performed so far that implies any data flow between two different levels. Notice how only the first and last commands involved the server.
```sequence
participant Working
participant Staging
participant Repo
Repo-->Working: git clone git@...
Working-->Staging: git add ...
Working-->Staging: git commit ...
Working-->Staging: git add ...
Working-->Staging: git commit ...
Staging-->Repo: git push
```
![](/assets/img/03-linear-git-project/A-cloning/sequence-00.jpg){: .mx-auto.d-block :}
The fact that nearly all Git commands are local has important implications. Let us start with the bad news:
......@@ -201,14 +191,7 @@ Why did I tell you about fetching, then? Two reasons: (i) so that you get a bett
For now, we have to adapt our workflow so that changes on the remote are handled. Let's say that I just have teeny tiny changes to make, and I pulled pretty recently. After I made my changes, but before I push them, I should be pulling again! The part of the workflow that has to be changed is the following:
```sequence
participant Working
participant Staging
participant Repo
Working-->Staging: git add ...
Working-->Staging: git commit ...
Staging-->Repo: git push
```
![](/assets/img/03-linear-git-project/B-fetching-pulling/sequence-01.jpg){: .mx-auto.d-block :}
The question that remains is: Should I pull just before or just after the commit? Both answers are technically valid, because Git is a very nice tool. However, there is a caveat:
......@@ -217,15 +200,7 @@ The question that remains is: Should I pull just before or just after the commit
This results in the following updated and safer workflow:
```sequence
participant Working
participant Staging
participant Repo
Working-->Staging: git add ...
Working-->Staging: git commit ...
Repo-->Staging: git pull
Staging-->Repo: git push
```
![](/assets/img/03-linear-git-project/B-fetching-pulling/sequence-02.jpg){: .mx-auto.d-block :}
(Notice that I chose to describe `git pull` as a command acting on the staging area, which is a white lie: it actually acts on the working copy. However, I think it helps visualizing the fact that your commit and the possible commits that are pulled will be interacting in some way.)
......
......@@ -124,7 +124,7 @@ navbar-text-col: "#404040"
navbar-border-col: "#DDDDDD"
page-col: "#F7F4EE"
text-col: "#404040"
link-col: "#008AFF"
link-col: "#FF4500"
hover-col: "#0085A1"
footer-col: "#F7EBD2"
footer-text-col: "#777777"
......
......@@ -120,7 +120,7 @@ navbar-text-col: "#404040"
navbar-border-col: "#DDDDDD"
page-col: "#F7F4EE"
text-col: "#404040"
link-col: "#008AFF"
link-col: "#FF4500"
hover-col: "#0085A1"
footer-col: "#F7EBD2"
footer-text-col: "#777777"
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
# Mermaid graphs
## Codes for the graphs in Section 3
```mermaid
sequenceDiagram
participant Working
participant Staging
participant Repo
Repo->>Working: git clone git@...
Working->>Staging: git add ...
Working->>Staging: git commit ...
Working->>Staging: git add ...
Working->>Staging: git commit ...
Staging->>Repo: git push
```
```mermaid
sequenceDiagram
participant Working
participant Staging
participant Repo
Working->>Staging: git add ...
Working->>Staging: git commit ...
Staging->>Repo: git push
```
```mermaid
sequenceDiagram
participant Working
participant Staging
participant Repo
Working->>Staging: git add ...
Working->>Staging: git commit ...
Repo->>Staging: git pull
Staging->>Repo: git push
```
## Conversion
I used [this online Mermaid editor](https://workflow.jace.pro) with configuration:
```json
{
"theme": "neutral"
}
```
"Link to image" then directly gives the generated JPEG image.
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment