Programming fundamentals
Git in a team: clean history, merge strategies and GitLab
Rewrite history with method, choose your merge strategy and scale teamwork with GitLab.
- Duration
- 14 h · 2 days
- Level
- Intermediate
- Format
- On site · Remote · Blended
- Max. group size
- 12 participants
Overview
This program deepens Git for teams: interactive rebase, undoing changes, cherry-pick, commit and version conventions, quality hooks, then collaborative organization with GitLab (groups, permissions, merge requests, continuous integration). It aims for a readable history and a well-run team workflow.
Who this program is for
- Experienced developers
- Tech leads
- DevOps and code quality managers
Prerequisites
- Mastery of Git basics (commit, branch, merge)
Learning objectives
- Troubleshoot difficult situations with Git
- Keep a clean history
- Choose a suitable merge strategy
- Apply commit and versioning conventions
- Automate checks with hooks
- Organize collaboration with GitLab
- Discover continuous integration
Detailed curriculum
4 modules · 14 h · 2 days
Day 1
Rewrite and fix history
30% theory · 70% practice
- Interactive rebase: reorder, squash, reword
- Reset, revert and reflog
- Cherry-pick
- Amending a commit
- Recovering lost work
🛠 Hands-on workshops
Clean up a branch1.5 h
Put the history of a messy branch back in order.
✅ Deliverable : A linear, readable history
Merging and best practices
50% theory · 50% practice
- Merge, squash and rebase: comparing them
- Resolving complex conflicts
- Commit conventions and semantic versioning
- Client-side hooks: lint and checks
- Ignored files and handling large files
Day 2
Collaboration with GitLab
30% theory · 70% practice
- Groups, projects, permissions and access tokens
- Merge requests and code reviews
- Branch protection rules
- Issues and work tracking
- Mirrored repositories
🛠 Hands-on workshops
Collaborative project1.5 h
Configure a team project with protections and review rules.
✅ Deliverable : A configured GitLab project
Workflows and continuous integration
30% theory · 70% practice
- Centralized, Gitflow and fork workflows
- Choosing according to team and product
- First continuous integration pipeline
- Automating tests and checks
- Setting up the team's rules
🛠 Hands-on workshops
Basic pipeline2 h
Write a pipeline that tests and validates a project.
✅ Deliverable : A working pipeline
Tools and technologies
GitGitHubGitLabVisual Studio Code
Teaching methods
- Alternating short lectures and hands-on work
- Live demonstrations by the trainer
- Capstone project built throughout the modules
- Group corrections and discussion of best practices
Assessment
- Hands-on exercises corrected in each module
- Mini-project completed at the end of the course
- Knowledge-check quiz
Required equipment
- A computer with an internet connection
- Git installed and access to a GitLab instance (provided or free account)
Resources provided
- Course materials and repository of corrected exercises
Career outcomes
- A formalized team workflow
- Shared contribution rules
- A basic continuous integration pipeline
Related video courses
My video courses that go with this program, to get ready for the training or to review afterwards. Free with an account.
