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
6c3a2e2d
Commit
6c3a2e2d
authored
4 years ago
by
Tobias Schlauch
Browse files
Options
Downloads
Patches
Plain Diff
Add improvements from the practical trial
parent
af5351c0
No related branches found
No related tags found
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
episodes/08-conflicts.md
+17
-7
17 additions, 7 deletions
episodes/08-conflicts.md
with
17 additions
and
7 deletions
Loading
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
