Skip to content
Snippets Groups Projects
Commit af5351c0 authored by Tobias Schlauch's avatar Tobias Schlauch
Browse files

Fix CI build and a typo

parent 2ca5fbca
No related branches found
No related tags found
1 merge request!1Resolve "Rework episode 9 (conflicts)"
......@@ -26,8 +26,8 @@ build_printable_episodes:
script:
- cd episodes
- pandoc --from markdown --to docx --out 01-using-shell.docx 01-using-shell.md
- pandoc --from markdown --to docx --out 08-remotes-in-gitlab.docx 08-remotes-in-gitlab.md
- pandoc --from markdown --to docx --out 09-conflicts.docx 09-conflicts.md
- pandoc --from markdown --to docx --out 08-conflicts.docx 08-conflicts.md
- pandoc --from markdown --to docx --out 09-remotes-in-gitlab.docx 09-remotes-in-gitlab.md
- pandoc --from markdown --to docx --out 10-collaboration-with-others.docx 10-collaboration-with-others.md
tags:
- docker
......
......@@ -44,7 +44,7 @@ In addition, [conflicts.pptx](extras/conflicts.pptx) shows an animation of all p
o - o <- HEAD, master
```
- Create a new branches
- Create a new branch
- `git branch mumy-info`
- Show what changed
- Verify with `git branch` and `git graph`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment