Skip to content

Commit

Permalink
Generated content from main
Browse files Browse the repository at this point in the history
@7003e779749f1f45f61d6c3429556829c137cf3d
  • Loading branch information
AlphaHydrae committed Oct 3, 2024
1 parent e46bc01 commit 27f9400
Show file tree
Hide file tree
Showing 48 changed files with 2,714 additions and 170 deletions.
1,254 changes: 1,254 additions & 0 deletions 2024-2025/subject-e6dd66399735549c0279.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions 2024-2025/subjects/apt/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Advanced Packaging Tool (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/apt/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/apt/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -540,6 +540,6 @@
[yum]: http://yum.baseurl.org/

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/automated-testing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Automated Testing (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/automated-testing/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/automated-testing/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -1789,6 +1789,6 @@
[windows-path]: https://www.computerhope.com/issues/ch000549.htm

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/cli/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Command Line Introduction (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/cli/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/cli/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -1722,6 +1722,6 @@
]

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/cloud/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Cloud Computing (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/cloud/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/cloud/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -738,6 +738,6 @@
[youtube-premium]: https://www.youtube.com/premium

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/continuous/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Continuous Software Development (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/continuous/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/continuous/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -277,6 +277,6 @@
[xp]: https://en.wikipedia.org/wiki/Extreme_programming

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/dns/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Domain Name System (DNS) (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/dns/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/dns/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -234,6 +234,6 @@
[tld]: https://en.wikipedia.org/wiki/Top-level_domain

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/docker-compose/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Docker Compose (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/docker-compose/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/docker-compose/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -344,6 +344,6 @@
[yaml]: https://yaml.org

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
4 changes: 2 additions & 2 deletions 2024-2025/subjects/docker/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Docker (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/docker/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/docker/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -507,6 +507,6 @@
[stack-overflow-survey]: https://survey.stackoverflow.co/2023/

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
</body>
</html>
89 changes: 52 additions & 37 deletions 2024-2025/subjects/git-branching/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Git Branching (Media Engineering Architecture &amp; Deployment)</title>
<meta charset='utf-8'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/57ce92388bfc7609ab555618417cec5ab3093fc8/subjects/git-branching/README.md&quot;}'>
<meta name='config' content='{&quot;basePath&quot;:&quot;../..&quot;,&quot;remark&quot;:{&quot;highlightLines&quot;:true,&quot;highlightSpans&quot;:true,&quot;countIncrementalSlides&quot;:false,&quot;navigation&quot;:{&quot;click&quot;:false,&quot;scroll&quot;:false,&quot;touch&quot;:false}},&quot;subjectUrl&quot;:&quot;https://github.com/MediaComem/comem-archidep/tree/7003e779749f1f45f61d6c3429556829c137cf3d/subjects/git-branching/README.md&quot;}'>
</head>
<body>
<textarea id='source'>
Expand Down Expand Up @@ -168,8 +168,10 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

> **Exercise:** our JavaScript calculator is missing some code.
> Let's create a branch to implement subtraction.
.exercise[
> **Exercise:** our JavaScript calculator is missing some code. Let's create a
> branch to implement subtraction.
]

It's very fast and simple to create a new branch. Run the following command to
create a branch called "feature-sub":
Expand Down Expand Up @@ -209,17 +211,18 @@
Now let's switch to the `feature-sub` branch:

```bash
$> git checkout feature-sub
$> git switch feature-sub # or git checkout feature-sub
Switched to branch 'feature-sub'
```

<git-memoir name='branchingOneLine' chapter='checkout' svg-height='137px'></git-memoir>

This moves `HEAD` to point to the `feature-sub` branch.

Nothing else happened because `HEAD` is still pointing to the same commit as `main`.
This moves `HEAD` to point to the `feature-sub` branch. Nothing else happened
because `HEAD` is still pointing to the same commit as `main`.

.exercise[
> **Exercise:** you can now implement the subtraction in `subtraction.js`.
]



Expand Down Expand Up @@ -250,21 +253,23 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

.exercise[
> **Exercise:** oops, you just noticed that addition is not working correctly.
> You need to make a bug fix, but you don't want to mix that code with the new
> subtraction feature. Let's **go back to `main`**:
]

```bash
$> git checkout main
$> git switch main # or git checkout main
Switched to branch 'main'
```

---
#### Checkout behavior
#### Switch/checkout behavior

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a> > <a href="#13">Switch back to `main`</a>]

Two things happened when you ran `git checkout main`:
Two things happened when you ran `git switch main` (or `git checkout main`):

* The `HEAD` pointer was **moved** back to the `main` branch.
* The files in your working directory were **reverted** back to the snapshot that `main` points to.
Expand All @@ -280,19 +285,22 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

.exercise[
> **Exercise:** let's create a new branch to fix the bug.
]

You can create a new branch *and* switch to it in one command with the `-b` (new
**b**ranch) option of the `checkout` command:
You can create a new branch *and* switch to it in one command with the `-c`
(**c**reate) option of the `switch` command or the `-b` (new **b**ranch) option
of the `checkout` command:

```bash
$> git checkout -b fix-add
$> git switch -c fix-add # or git checkout -b fix-add
Switched to a new branch 'fix-add'
```

<git-memoir name='branchingOneLine' chapter='another-branch' svg-height='137px'></git-memoir>

Nothing has changed yet because `fix-add` still points to the same commit as `main`.
Nothing changed yet because `fix-add` still points to the same commit as `main`.



Expand All @@ -301,7 +309,9 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

.exercise[
> **Exercise:** fix addition in `addition.js` and commit your changes.
]

```bash
$> git add addition.js
Expand All @@ -319,12 +329,12 @@

Now your project history has **diverged**.

The changes in `feature-sub` and `fix-add` are **isolated**.
You can **switch back and forth** between the branches with `git checkout`.
The changes in `feature-sub` and `fix-add` are **isolated**. You can **switch
back and forth** between the branches with `git switch` or `git checkout`:

<git-memoir name='branching' chapter='switch-branches' svg-height='250px'></git-memoir>

Every time you check out one of these branches, the files in your **working
Every time you switch to one of these branches, the files in your **working
directory** are updated to reflect the state of the corresponding commit, or
snapshot.

Expand All @@ -335,17 +345,15 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

Now that you've tested your fix and made sure it works,
you want to **bring those changes** back **into the `main` branch**.

Git's `merge` command can do that for you,
but it can only **bring changes** from another branch **into the current branch**,
not the other way around.
Now that you've tested your fix and made sure it works, you want to **bring
those changes** back **into the `main` branch**.

So you must first switch to the `main` branch:
Git's `merge` command can do that for you, but it can only **bring changes**
from another branch **into the current branch**, not the other way around. So
you must first switch to the `main` branch:

```bash
$> git checkout main
$> git switch main # or git checkout main
```

<git-memoir name='branching' chapter='fast-forward-merge-checkout' svg-height='200px'></git-memoir>
Expand Down Expand Up @@ -386,9 +394,11 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

.exercise[
> **Exercise:** now that we've brought our fix back into `main`, we don't need
> the `fix-add` branch anymore. Let's delete it with the `-d` (**d**elete)
> option of the `branch` command:
]

```bash
$> git branch -d fix-add
Expand All @@ -404,11 +414,13 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a>]

> **Exercise:** let's switch back to our `feature-sub` branch and finish our work.
Write a comment for the subtract function and commit your changes.
.exercise[
> **Exercise:** let's switch back to our `feature-sub` branch and finish our
> work. Write a comment for the subtract function and commit your changes.
]

```bash
$> git checkout feature-sub
$> git switch feature-sub # or git checkout feature-sub
(Write your comment...)
$> git add subtraction.js
$> git commit -m "Comment subtract function"
Expand Down Expand Up @@ -440,10 +452,13 @@

.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#7">Working with branches</a> > <a href="#23">Merging a divergent history</a>]

> **Exercise:** switch back to the `main` branch and merge `feature-sub` into it.
.exercise[
> **Exercise:** switch back to the `main` branch and merge `feature-sub` into
> it.
]

```bash
$> git checkout main
$> git switch main # or git checkout main
$> git merge feature-sub
Merge made by the 'recursive' strategy.
subtraction.js | 5 ++++-
Expand Down Expand Up @@ -540,10 +555,10 @@
.breadcrumbs[<a href="#1">Git Branching</a> > <a href="#27">Merge conflicts</a>]

You can create a branch at any point in the project's history by passing an
additional commit reference to `git checkout`:
additional commit reference to `git switch` or `git checkout`:

```bash
$> git checkout -b better-sub 4f94fa
$> git switch -c better-sub 4f94fa # or git checkout -b better-sub 4f94fa
```

<git-memoir name='branching' chapter='checkout-past' svg-height='250px'></git-memoir>
Expand All @@ -570,7 +585,7 @@
Git won't let you do it because the state of `subtraction.js` is different in that branch:

```bash
$> git checkout main
$> git switch main # or git checkout main
error: Your local changes to the following files would be overwritten by checkout:
subtraction.js
Please commit your changes or stash them before you switch branches.
Expand Down Expand Up @@ -603,7 +618,7 @@
Go back to `main` and merge the `better-sub` branch:

```bash
$> git checkout main
$> git switch main # or git checkout main
$> git merge better-sub
Auto-merging subtraction.js
CONFLICT (content): Merge conflict in subtraction.js
Expand Down Expand Up @@ -766,7 +781,7 @@
Let's again pretend to be another colleague starting from the same point:

```bash
$> git checkout -b cleanup 4f94fa
$> git switch -c cleanup 4f94fa # or git checkout -b cleanup 4f94fa
```

<git-memoir name='branching' chapter='conflicting-file-change-checkout' svg-height='250px'></git-memoir>
Expand Down Expand Up @@ -798,7 +813,7 @@
Let's try to merge that branch into `main`:

```bash
$> git checkout main
$> git switch main # or git checkout main
$> git merge cleanup
CONFLICT (modify/delete): subtraction.js deleted in cleanup
and modified in HEAD. Version HEAD of subtraction.js left in tree.
Expand Down Expand Up @@ -911,7 +926,7 @@
[understanding-branches]: https://blog.thoughtram.io/git/rebase-book/2015/02/10/understanding-branches-in-git.html

</textarea>
<script src='../../subject-b46dd158740b5c168516.js'></script>
<script src='../../subject-e6dd66399735549c0279.js'></script>
<script src='./index.js'></script>
</body>
</html>
Loading

0 comments on commit 27f9400

Please sign in to comment.