Skip to content

Commit

Permalink
Improve fixing your mistakes section
Browse files Browse the repository at this point in the history
Improve the presentation for fixing your mistakes by only showing the
question first. Advancing the slide shows the method to fix this
problem.
  • Loading branch information
mikelorant committed Mar 20, 2024
1 parent d4eed7e commit 0351e43
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions pages/fix-your-mistakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ image: https://images.unsplash.com/photo-1533374206871-33b8f07c216c

Oops...

> I made a mistake and want to amend the previous commit.
<v-click>

<br />

> I made a mistake and want to amend the previous commit.
```shell
git add -p
git commit --amend --no-edit
Expand All @@ -32,6 +35,8 @@ git commit --amend --no-edit

</div>

</v-click>

---
layout: full
preload: false
Expand All @@ -48,15 +53,20 @@ image: https://images.unsplash.com/photo-1591014827159-2e158ceac55d

Oops...

> I accidentally added changes that shouldn't be included in the previous commit.
<v-click>

<br />

> I accidentally added changes that shouldn't be included in the previous commit.
```shell
git restore --source=main --patch
git add -p
git commit --amend --no-edit
```

</v-click>

---
layout: full
preload: false
Expand All @@ -73,9 +83,12 @@ image: https://images.unsplash.com/photo-1577594829182-ff8eb109760e

Oops...

> I have a change that I don't want to include with the previous commit.
<v-click>

<br />

> I have a change that I don't want to include with the previous commit.
```shell
git add -p
git commit
Expand All @@ -91,6 +104,8 @@ git commit

</div>

</v-click>

---
layout: full
preload: false
Expand Down

0 comments on commit 0351e43

Please sign in to comment.