Skip to content

Commit 40be973

Browse files
committed
Trying to fix a mermaid diagram
1 parent 6b2c482 commit 40be973

File tree

1 file changed

+18
-24
lines changed

1 file changed

+18
-24
lines changed

docs/teamwork.md

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,17 @@ NOTE: GitHub previously used "master", but is now using "main" as the name for t
4545

4646
## Concepts and commands
4747

48-
<!-- .slide: style="font-size: 28px;" -->
49-
5048
In these exercises we will use only a few commands. These have all been mentioned before in this course, but as a refresher I will briefly discuss a couple commands here, namely:
5149

5250
- `git fetch`: This is a primary command used to download contents from a remote repository.
53-
- example: your teammate has created a new feature branch which they have pushed to the remote repository, but which you do not yet have in your local repository
51+
- example: your teammate has created a new feature branch which they have pushed to the remote repository, but which you do not yet have in your local repository
5452
- `git push`: This is essentially the same as running `git merge main` from inside the remote repository. It is mostly used to upload local changes to a remote repository.
5553
- `git pull`: This will fetch the latest changes from the current branch from a remote, then apply the changes to your local copy of the branch. It is similar to doing a fetch and a merge.
5654

5755
---
5856

5957
## Git push
6058

61-
<!-- .slide: style="font-size: 30px;" -->
62-
6359
```shell
6460
$ git push <remote-repo> <branch>
6561
```
@@ -74,26 +70,24 @@ where the default behaviour is pushing to repository "origin" and the same branc
7470

7571
---
7672

77-
<!-- .slide: style="font-size: 30px;" -->
78-
7973
Before pushing:
80-
```graphviz
81-
digraph {
82-
rankdir=LR
83-
node [shape=circle width=0.5 fixedsize=shape]
84-
edge [arrowhead=none][shape=none]
85-
"a" -> "b"
86-
a [fixedsize=true label=" "]
87-
"b" -> "c"
88-
b [fixedsize=true label=" "]
89-
"c" -> "d"
90-
c [fixedsize=true label=" "]
91-
d [fixedsize=true label=" " style=filled fillcolor=blue]
92-
"main" -> "d" [style=dashed arrowhead=normal]
93-
"origin/main" -> "b" [style=dashed arrowhead=normal]
94-
main [shape=box width=0.8 style=filled fillcolor=lightblue]
95-
"origin/main" [shape=box width=1.2 style=filled fillcolor=lightblue]
96-
}
74+
75+
```mermaid
76+
graph LR
77+
A((" "))
78+
origin["origin/main"]
79+
style origin fill:#ffffff,stroke:#ffffff,color:#add8e6
80+
B((" "))
81+
C((" "))
82+
main["main"]
83+
style main fill:#ffffff,stroke:#ffffff,color:#add8e6
84+
D((" "))
85+
style D fill:#305cde,stroke:#ffffff,color:#305cde
86+
A --- B
87+
origin -.-> B
88+
B --- C
89+
C --- D
90+
main -.-> D
9791
```
9892

9993
After pushing:

0 commit comments

Comments
 (0)