Skip to content

Commit 10e261f

Browse files
committed
Fixing more internal links
1 parent c7d1a1a commit 10e261f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

01_version_control/merge_rebase_slides.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ slideOptions:
3838

3939
## Linear History
4040

41-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/main/01_version_control/figs/history_linear/fig.png" width=60%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
41+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/01_version_control/figs/history_linear/fig.png" width=60%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
4242

4343
- Commits are snapshots + pointer to parent, not diffs
4444
- But for linear history, this makes no difference
@@ -55,7 +55,7 @@ slideOptions:
5555

5656

5757
- `git checkout main && git merge feature`
58-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/main/01_version_control/figs/history_merge/fig.png" width=70%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px" >
58+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/01_version_control/figs/history_merge/fig.png" width=70%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px" >
5959
- A merge commit (normally) has two parent commits `M^1` and `M^2` (don't confuse `^2` with `~2`)
6060
- Can't show unique diff
6161
- First parent relative to the branch you are on (`M^1` = `C`, `M^2` = `E`)
@@ -91,7 +91,7 @@ We use here:
9191
## Rebase
9292

9393
- `git checkout feature && git rebase main`
94-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/main/01_version_control/figs/history_rebase/fig.png" width=90%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
94+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/01_version_control/figs/history_rebase/fig.png" width=90%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
9595
- New parents --> new hashes --> history is rewritten
9696
- If `feature` is already on remote, it needs a force push `git push --force myfork feature`
9797
- Be careful: only use rebase if **only you** work on a branch (a local branch or a branch on your fork)

02_virtualization_and_containers/containers_slides.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ slideOptions:
2929

3030
## What is a Container?
3131

32-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/main/virtualization-and-containers/material/figs/container-sketch.png" width=30%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
32+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/02_virtualization_and_containers/figs/container-sketch.png" width=30%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
3333

3434

3535
- Container operates in "fenced off" part of the operating system (`namespaces`)

02_virtualization_and_containers/virtualmachines_slides.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ slideOptions:
2929

3030
## What is a Virtual Machine?
3131

32-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/main/02_virtualization_and_containers/figs/virtualmachine-sketch.png" width=40%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
32+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/02_virtualization_and_containers/figs/virtualmachine-sketch.png" width=40%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
3333

3434
- Environment that allows you to run any (supported) operating system (OS)
3535
- Virtual Machines are portable and flexible

03_building_and_packaging/cmake_exercise.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Deadline: **Thursday, December 2nd, 2021, 9:00**
88

99
## Overview
1010

11-
- The goal of the exercise is to open a pull request from a fork of [this repository](https://github.com/Simulation-Software-Engineering/cmake-exercise/). Please name your pull request `Add building and container recipes` and assign yourself.
11+
- The goal of the exercise is to open a pull request from a fork of [this repository](https://github.com/Simulation-Software-Engineering/cmake-exercise). Please name your pull request `Add building and container recipes` and assign yourself.
1212
- Your should add a `Dockerfile` and a `CMakeLists.txt`, besides some minor changes in `main.cpp` like commenting in some code parts. It should be possible to create an executable container from your pull request. Inside the container, one should be able to directly build the C++ code (`main.cpp`) using CMake. Use as many of the currently commented-out additional files, which induce additional dependencies.
1313

1414
## First steps

03_building_and_packaging/systempaths_and_librarytools_slides.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ SlideOptions:
6363

6464
- Defines filesystem layout and location of common files on Linux
6565

66-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/figs/filesystem_hierarchy_structure/fig.png?raw=true" width=100%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
66+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/figs/filesystem_hierarchy_structure/fig.png" width=100%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
6767

6868
- [Official homepage of FHS](https://refspecs.linuxfoundation.org/fhs.shtml)
6969

@@ -136,7 +136,7 @@ SlideOptions:
136136

137137
- System-wide and user-specific
138138

139-
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/figs/filesystem_paths_python/fig.png?raw=true" width=75%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
139+
<img src="https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/figs/filesystem_paths_python/fig.png" width=75%; style="margin-left:auto; margin-right:auto; padding-top: 25px; padding-bottom: 25px">
140140

141141
- `PYTHONPATH`: Environment variable for non-standard installation of modules/packages
142142
- Points to `prefix/lib/pythonX.Y/site-packages`

0 commit comments

Comments
 (0)