Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Version Control with Git - Archived
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
HIFIS
HIFIS Software Services
Education and Training
Workshop Materials
Git and GitLab Courses
Version Control with Git - Archived
Commits
af5351c0
Commit
af5351c0
authored
4 years ago
by
Tobias Schlauch
Browse files
Options
Downloads
Patches
Plain Diff
Fix CI build and a typo
parent
2ca5fbca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1
Resolve "Rework episode 9 (conflicts)"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
episodes/08-conflicts.md
+1
-1
1 addition, 1 deletion
episodes/08-conflicts.md
with
3 additions
and
3 deletions
.gitlab-ci.yml
+
2
−
2
View file @
af5351c0
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
episodes/08-conflicts.md
+
1
−
1
View file @
af5351c0
...
...
@@ -44,7 +44,7 @@ In addition, [conflicts.pptx](extras/conflicts.pptx) shows an animation of all p
o - o <- HEAD, master
```
-
Create a new branch
es
-
Create a new branch
-
`git branch mumy-info`
-
Show what changed
-
Verify with
`git branch`
and
`git graph`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment