Skip to content

Commit 7c13ff9

Browse files
committed
Converting another graphvix to mermaid, this time for the section after hint
1 parent da03cf4 commit 7c13ff9

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

docs/teamwork.md

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ graph LR
118118

119119
---
120120

121-
<!-- .slide: style="font-size: 30px;" -->
122-
123121
Pushing a staged and committed file:
124122

125123
```shell
@@ -146,8 +144,6 @@ Date: Sun Nov 13 15:43:05 2022 +0100
146144

147145
## Git pull
148146

149-
<!-- .slide: style="font-size: 30px;" -->
150-
151147
Fetch the given remote's copy of the current branch and merge to the local copy:
152148
```shell
153149
$ git pull <remote-repo>
@@ -163,8 +159,6 @@ $ git pull
163159

164160
## Hint
165161

166-
<!-- .slide: style="font-size: 30px;" -->
167-
168162
If you have forgotten to pull before staging and committing new stuff, and your colleague has added something to the remote repository in between, this is a handy command:
169163

170164
```shell
@@ -175,29 +169,36 @@ It fetches the remote content but does not create a new merge commit.
175169

176170
---
177171

178-
<!-- .slide: style="font-size: 30px;" -->
179-
180172
Assume this situation:
181-
```graphviz
182-
digraph {
183-
rankdir=LR
184-
node [shape=circle width=0.5 fixedsize=shape]
185-
edge [arrowhead=none][shape=none]
186-
"d" -> "e"
187-
"e" -> "a"
188-
"e" -> "f"
189-
a [fixedsize=true label="a"]
190-
"a" -> "b"
191-
"b" -> "c"
192-
b [fixedsize=true label="b"]
193-
c [fixedsize=true label="c"]
194-
d [fixedsize=true label="d"]
195-
"f" -> "g"
196-
"main" -> "c" [style=dashed arrowhead=normal]
197-
"origin/main" -> "e" [style=dashed arrowhead=normal]
198-
main [shape=box width=0.8 style=filled fillcolor=lightblue]
199-
"origin/main" [shape=box width=1.2 style=filled fillcolor=lightblue]
200-
}
173+
174+
```mermaid
175+
graph LR
176+
d(("d"))
177+
style d fill:#ffffff,stroke:#000000,color:#ffffff
178+
e(("e"))
179+
style e fill:#ffffff,stroke:#000000,color:#ffffff
180+
origin["origin/main"]
181+
style origin fill:#add8e6,stroke:#000000,color:#000000
182+
d --- e
183+
origin -.-> e
184+
a(("a"))
185+
style a fill:#ffffff,stroke:#000000,color:#ffffff
186+
f(("f"))
187+
style f fill:#ffffff,stroke:#000000,color:#ffffff
188+
e --- a
189+
e --- f
190+
b(("b"))
191+
style b fill:#ffffff,stroke:#000000,color:#ffffff
192+
g(("g"))
193+
style g fill:#ffffff,stroke:#000000,color:#ffffff
194+
main["main"]
195+
style main fill:#add8e6,stroke:#000000,color:#000000
196+
c(("c"))
197+
style c fill:#ffffff,stroke:#000000,color:#ffffff
198+
a --- b
199+
f --- g
200+
b --- c
201+
origin -.-> c
201202
```
202203

203204
Now we do a `git pull`:

0 commit comments

Comments
 (0)