Skip to content

Commit 5278f7a

Browse files
authored
Merge branch 'main' into patch-2
2 parents d599183 + d7e8ae3 commit 5278f7a

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

00_organization/course_intro_slides.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ td {
209209
| 03.12. |Lab | 3 | CPack | Benjamin |
210210
| 10.12. |Lecture | 4 | Technical writing | Gerasimos |
211211
| 10.12. |Lab | 4 | Code review | Gerasimos |
212-
| 19.12. |Presentations | C | **2nd student presentations** | students |
213-
| 19.12. |Presentations | C | **2nd student presentations** | students |
212+
| 17.12. |Presentations | C | **2nd student presentations** | students |
213+
| 17.12. |Presentations | C | **2nd student presentations** | students |
214214

215215
---
216216

01_version_control/my_favorite_neat_little_git_trick_demo.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
1818
- If you rebased/merged and messed up your history, use `git reflog` to go back to a previous state
1919
- If you only need one file from another commit or branch, use `git checkout <branch_or_sha> -- <path>`
20+
- Use [Git LFS](https://git-lfs.com/) for big files >10 MB or for non-diffable binaries (e.g., images, media, archives, shared libraries).
2021
2122
## Tricks from Winter Term 2024/25
2223

02_virtualization_and_containers/docker_slides.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ Details available in [`docker_demo.md`](https://github.com/Simulation-Software-E
255255
- User ID mapping
256256
- [Multistage builds](https://docs.docker.com/develop/develop-images/multistage-build/)
257257
- Build image by combining layers created from different base images
258-
- [Different mount typs](https://docs.docker.com/storage)
258+
- [Different mount types](https://docs.docker.com/storage)
259259
- Volumes, bind mount, tmpfs mount
260260
- [Persisting data](https://docs.docker.com/get-started/05_persisting_data/)
261261
- [Multi-container apps](https://docs.docker.com/get-started/07_multi_container/)

02_virtualization_and_containers/vagrant_demo.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
- `vagrant package --base "sse-first-step" --output sse-first-step.box`: Export VM
5656
- `sse-first-steps.box` can be uploaded to [Vagrant Cloud](https://app.vagrantup.com)
5757
- Go to directory `using-own-box/`
58-
- Show `Vagrantfile` that is has my uploaded image as base image
58+
- Show `Vagrantfile` that has my uploaded image as base image
5959
- Skip building box `vagrant up` as it takes too long, should be prebuilt
6060
- After `vagrant box add <box> --name <name>`, `vagrant box list` should show my box in overview.
6161

@@ -65,7 +65,7 @@
6565
- [https://github.com/precice/vm](https://github.com/precice/vm)
6666
- Run [Premade box](https://app.vagrantup.com/precice/boxes/precice-vm)
6767
- Create a dedicated folder `mkdir precice`
68-
- Create box with `vagrant init` (Done before lecture as it takes to long)
68+
- Create box with `vagrant init` (Done before lecture as it takes too long)
6969
- Start box `vagrant up`
7070
- Comes with a GUI
7171
- Preconfigured

0 commit comments

Comments
 (0)