Skip to content

Commit 141a4fd

Browse files
committed
Fix tutorial 11
1 parent f476a32 commit 141a4fd

14 files changed

+13
-13
lines changed

week11/images/com2.png

587 KB
Loading

week11/tutorial/tutorial-11.qmd

+13-13
Original file line numberDiff line numberDiff line change
@@ -43,40 +43,40 @@ They are identified with a unique SHA or SHA1 number.
4343
You can move up and down by pressing `u` or `d`. To exit, press `q`.
4444
:::
4545

46-
5. List the commits that have been done in the repo since 1 May 2020 only.
46+
5. List the commits that have been done in the repo since 14 May 2024 only.
4747

4848
::: {.unilur-solution}
49-
`git log --since=01-05-2020`
49+
`git log --since=14-05-2024`
5050
:::
5151

52-
6. Open the local project in VSCode and have a look at the tree history and the commit messages. Specially have a look at longer commits that contain not only one line but also some more text.
52+
6. Open the local project in RStudio and have a look at the tree history and the commit messages. Specially have a look at longer commits that contain not only one line but also some more text.
5353

5454
7. Where is the repo HEAD?
5555

56-
8. Using the command line interface or terminal move the HEAD of the repository to the commit a82635e
56+
8. Using the command line interface or terminal move the HEAD of the repository to two commits back from the most recent
5757

5858
::: {.unilur-solution}
59-
`git checkout a82635e`
59+
`git checkout e208fa8`
6060
:::
6161

62-
9. What is the commit first line of commit a82635e?
62+
9. What is the first line of the commit message of this commit?
6363

6464
::: {.unilur-solution}
65-
Fix CI/rubocop / build
65+
Merge pull request 4339 from isasharafdin/todo
6666
:::
6767

6868
10. Which files have been modified in that commit?
6969

7070
::: {.unilur-solution}
71-
![](../images/modified_files.png){fig-align="center"}
71+
Just `topics/todo/index.md`
7272
:::
7373

74-
11. What is the difference between commit a82635e and the previous commit?
74+
11. What is the difference between this commit and the previous commit?
7575

7676
::: {.unilur-solution}
77-
First, `git log a82635e` to find the SHA of the previous commits. Then, `git diff 108a0c92a9caa7 HEAD`
77+
First, `git log e208fa8` to find the SHA of the previous commits. Then, `git diff ff120c2 HEAD`
7878

79-
![](../images/diff2.png){fig-align="center"}
79+
:::
8080

8181
12. Move the HEAD of the repository back to where was originally located (last commit of the main (or master) branch)
8282

@@ -120,7 +120,7 @@ To unstage, `git reset`.
120120

121121
19. Run a git log --oneline and have a look at the commit that you did before the last commit.
122122

123-
20. Pick the commit that you did before the last commit and do git reset SHA. What happens?
123+
20. Pick the commit that you did before the last commit and do git reset SHA. What happens? Why is this not best practice?
124124

125125
::: {.unilur-solution}
126126
```
@@ -129,5 +129,5 @@ git log
129129
git reset SHA
130130
```
131131

132-
You will see that the last commit has disappeared from the repo history.
132+
You will see that the last commit has disappeared from the repo history. This is not considered best practice as it modifies the public record of the repository history.
133133
:::
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)