Skip to content

Commit

Permalink
Replaces - for * as lists on markdown examples
Browse files Browse the repository at this point in the history
Markdown accepts either `-` or `*` however, in this material, the `-`
causes confussion when looking at diffs as you'd get things like:

```diff
 - avocado
-- lemon
+- lime
```

making the `-` from the diff misunderstood with the `-` of the list.
  • Loading branch information
dpshelio committed Aug 14, 2024
1 parent 2c983e7 commit 21c9dac
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 68 deletions.
46 changes: 23 additions & 23 deletions episodes/04-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lemon
- salt
* avocado
* lemon
* salt
# Instructions
```

Expand Down Expand Up @@ -248,9 +248,9 @@ index df0654a..315bf3a 100644
+++ b/guacamole.md
@@ -1,2 +1,5 @@
# Ingredients
+- avocado
+- lemon
+- salt
+* avocado
+* lemon
+* salt
# Instructions
```

Expand Down Expand Up @@ -358,9 +358,9 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
```

Expand All @@ -375,10 +375,10 @@ index 315bf3a..b36abfd 100644
+++ b/guacamole.md
@@ -1,5 +1,5 @@
# Ingredients
- avocado
-- lemon
+- lime
- salt
* avocado
-* lemon
+* lime
* salt
# Instructions
```

Expand Down Expand Up @@ -411,10 +411,10 @@ index 315bf3a..b36abfd 100644
+++ b/guacamole.md
@@ -1,5 +1,5 @@
# Ingredients
- avocado
-- lemon
+- lime
- salt
* avocado
-* lemon
+* lime
* salt
# Instructions
```

Expand Down Expand Up @@ -695,9 +695,9 @@ $ cat guacamole.md

```output
# Ingredients
- avocado (1.35)
- lime (0.64)
- salt (2)
* avocado (1.35)
* lime (0.64)
* salt (2)
```

```bash
Expand All @@ -707,9 +707,9 @@ $ cat groceries.md

```output
# Market A
- avocado: 1.35 per unit.
- lime: 0.64 per unit
- salt: 2 per kg
* avocado: 1.35 per unit.
* lime: 0.64 per unit
* salt: 2 per kg
```

Now you can add both files to the staging area. We can do that in one line:
Expand Down
34 changes: 17 additions & 17 deletions episodes/05-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
An ill-considered change
```
Expand All @@ -55,8 +55,8 @@ index b36abfd..0848c8d 100644
--- a/guacamole.md
+++ b/guacamole.md
@@ -3,3 +3,4 @@
- lime
- salt
* lime
* salt
# Instructions
+An ill-considered change
```
Expand Down Expand Up @@ -85,9 +85,9 @@ index df0654a..b36abfd 100644
+++ b/guacamole.md
@@ -1,2 +1,5 @@
# Ingredients
+- avocado
+- lime
+- salt
+* avocado
+* lime
+* salt
# Instructions
```

Expand Down Expand Up @@ -146,9 +146,9 @@ index df0654a..93a3e13 100644
+++ b/guacamole.md
@@ -1,2 +1,5 @@
# Ingredients
+- avocado
+- lime
+- salt
+* avocado
+* lime
+* salt
# Instructions
+An ill-considered change
```
Expand All @@ -168,9 +168,9 @@ index df0654a..93a3e13 100644
+++ b/guacamole.md
@@ -1,2 +1,5 @@
# Ingredients
+- avocado
+- lime
+- salt
+* avocado
+* lime
+* salt
# Instructions
+An ill-considered change
```
Expand Down Expand Up @@ -209,9 +209,9 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
```

Expand Down
8 changes: 4 additions & 4 deletions episodes/08-collab.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ $ cat hummus.md

```output
# Ingredients
- chickpeas
- lemon
- olive oil
- salt
* chickpeas
* lemon
* olive oil
* salt
```

```bash
Expand Down
48 changes: 24 additions & 24 deletions episodes/09-conflict.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
```

Expand All @@ -49,11 +49,11 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
- put one avocado into a bowl.
* put one avocado into a bowl.
```

and then push the change to GitHub:
Expand Down Expand Up @@ -95,11 +95,11 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
- peel the avocados
* peel the avocados
```

We can commit the change locally:
Expand Down Expand Up @@ -208,14 +208,14 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
<<<<<<< HEAD
- peel the avocados
* peel the avocados
=======
- put one avocado into a bowl.
* put one avocado into a bowl.
>>>>>>> dabb4c8c450e8475aee9b14b4383acc99f42af1d
```

Expand All @@ -238,11 +238,11 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
- peel the avocados and put them into a bowl.
* peel the avocados and put them into a bowl.
```

To finish merging,
Expand Down Expand Up @@ -322,11 +322,11 @@ $ cat guacamole.md

```output
# Ingredients
- avocado
- lime
- salt
* avocado
* lime
* salt
# Instructions
- peel the avocados and put them into a bowl.
* peel the avocados and put them into a bowl.
```

We don't need to merge again because Git knows someone has already done that.
Expand Down

0 comments on commit 21c9dac

Please sign in to comment.