Git & Version Control
From solo commits to confident team workflows.
Level
All levels
Duration
2-day intensive
Format
On-site / Online
Group size
Up to 8
Language
English
Overview
Version control is the backbone of every serious software team — yet most developers learn Git by memorizing five commands and hoping for the best. This course replaces that anxiety with a working mental model.
Over two intensive days, your team learns how Git actually thinks: commits as snapshots, branches as pointers, and history as something you can navigate and repair with confidence. Every concept is practiced hands-on, on realistic multi-person scenarios — merge conflicts included, on purpose.
By the end, your team shares one workflow, one vocabulary, and the confidence to untangle any repository state without fear of losing work.
What You'll Learn
- Build a correct mental model of commits, branches, and the staging area
- Choose and apply a team branching strategy (trunk-based or GitFlow)
- Resolve merge conflicts calmly and correctly
- Rewrite history safely with rebase, amend, and interactive rebase
- Recover from any mistake using reflog, reset, and revert
- Run effective pull-request reviews that catch issues early
Syllabus
1Git FoundationsHow Git thinks — the model that makes everything else click.
- Repositories, commits, and the staging area
- Reading history: log, diff, show
- Ignoring files and .gitignore patterns
- Undoing changes: restore, reset, revert
2Branching & MergingBranches as cheap, disposable pointers — and what merging really does.
- Creating and switching branches
- Fast-forward vs. three-way merges
- Merge conflicts: reading, resolving, verifying
- Rebase vs. merge — when and why
3Team WorkflowsWorking with remotes and other people without stepping on each other.
- Remotes: fetch, pull, push
- Pull requests and code review practice
- Trunk-based development vs. GitFlow
- Protecting main: reviews, checks, conventions
4Recovery & Advanced ToolsThe safety net: nothing committed is ever truly lost.
- Reflog: your undo history
- Interactive rebase and history cleanup
- Cherry-pick, stash, and bisect
- Tags, releases, and hooks
Who It's For
Audience
Developers, data scientists, and technical staff who use Git daily but want real fluency — and teams that want a single, shared workflow.
Prerequisites
Comfortable working in a terminal. No prior Git expertise required — we calibrate the pace to the group.
Practical Details
- Format: on-site at your office anywhere in Sweden, or live online
- Group size: up to 8 participants for maximum hands-on time
- Materials: full exercise repository, cheat sheets, and reference slides included
- Follow-up: 30 days of email Q&A after the course
“We have engaged Hani to deliver several of our courses, including the Git course. He delivered the course very professionally, and the end customer was extremely satisfied with the quality of the training and the overall result.”
Related Courses
R for Data Analysis
From spreadsheets to reproducible analysis.
Python Programming
Practical Python for data work and automation.
Next.js Web Development
Modern React applications, production-ready.
Bring Git & Version Control to your team
Tell us about your team's context and we'll tailor the curriculum, exercises, and pace before day one.