Skip to content

Commit 2094d73

Browse files
committed
Continuing the conversion
1 parent 00a1b16 commit 2094d73

File tree

1 file changed

+21
-26
lines changed

1 file changed

+21
-26
lines changed

docs/branches.md

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -298,29 +298,33 @@ graph LR
298298
```
299299

300300
Delete 'cool-feature'
301-
```graphviz
302-
digraph {
303-
rankdir=LR
304-
"commit2" -> "commit1"
305-
"commitX" -> "commit1"
306-
"commit3" -> "commit2"
307-
"commitY" -> "commitX"
308-
"master" -> "commit4" [style=dashed]
309-
"commit4" -> "commit3"
310-
"commit4" -> "commitY"
311-
master [shape=plaintext]
312-
}
301+
302+
```mermaid
303+
graph LR
304+
305+
commitX(["commitX"])
306+
commit1(["commit1"])
307+
commit2(["commit2"])
308+
commitY(["commitY"])
309+
commit3(["commit3"])
310+
311+
commit2 --> commit1
312+
commitX --> commit1
313+
commit3 --> commit2
314+
commitY --> commitX
315+
316+
master["master"]
317+
master -.-> commit4
318+
commit4 --> commit3
319+
commit4 --> commitY
313320
```
321+
314322
(Time goes leftwards)
315323

316324
---
317325

318-
<!-- .slide: data-background="#ffffff" -->
319-
320326
## Switching with uncommitted changes
321327

322-
<!-- .slide: style="font-size: 26px;" -->
323-
324328
As mentioned above, you switch between branches with:
325329

326330
```shell
@@ -339,13 +343,8 @@ What if there is a conflict?
339343

340344
---
341345

342-
<!-- .slide: data-background="#ffffff" -->
343-
344346
### Example - new file
345347

346-
<!-- .slide: style="font-size: 30px;" -->
347-
348-
**We continue in the same repository!**
349348
Here we create a new branch, switch to it, then add a new file. Then we switch back to the master branch without committing the changes:
350349

351350
```shell
@@ -362,11 +361,7 @@ Git warns that there is a file added (`A`) in one branch but not the other, but
362361

363362
---
364363

365-
<!-- .slide: data-background="#ffffff" -->
366-
367-
### Example - modified file
368-
369-
<!-- .slide: style="font-size: 32px;" -->
364+
### Example - modified file
370365

371366
**We continue in the same repository!**
372367
First commit the `newfile.txt` in the cool-feature branch to clean the environment.

0 commit comments

Comments
 (0)