Git & GitFlow in a Team
Versioning, branches, conflict resolution, pull requests and collaborative workflows (GitFlow, trunk-based).
- Master the essential Git commands
- Manage branches and merges without stress
- Collaborate through pull/merge requests
- Adopt an effective team workflow
- Work in parallel on several features without ever breaking the main branch
- Resolve a complex merge conflict on your own, without panic or lost code
- Set up a GitFlow or trunk-based workflow suited to the size of your team
- Review and approve code effectively through pull requests, a daily professional habit
The programme
Day 1 - Fundamentals & solo workflow
- Git data model: objects, commits, index, working tree
- Branches, fast-forward vs 3-way merge, interactive rebase
- Conflict resolution: strategies and tools (VSCode, vimdiff)
- Advanced commands: cherry-pick, bisect, reflog, stash
- Workshop: a complete work cycle on a real repository
Day 2 - Collaboration & industrialisation
- Remote repositories: fetch, pull --rebase, push --force-with-lease
- Pull requests, code review and merge strategies
- GitFlow vs trunk-based development: criteria for choosing
- Git hooks: pre-commit (Prettier, ESLint), commit-msg, pre-push
- Workshop: complete team workflow: PR, review, merge, release tag, CI/CD pipeline triggered
Who is this for
Developers, ops, data engineers and any technical team collaborating on code.
Prerequisites
- No prior Git knowledge required
- Basic use of a terminal
Format
Frequently asked questions
Is the course eligible for OPCO or CPF funding?
No. Sphinx-Digital is not Qualiopi certified and is not listed on Mon Compte Formation. The course is invoiced directly to the company or the individual, with no external funding.
What is the difference between the public (inter-company) and in-company formats?
In the public format, you join a session with participants from other companies (3 to 10 people). In-company, we run a session dedicated to your team, on your site or remotely, with content adapted to your context. In-company pricing is available on quote.
Remote or on-site: what are the practical differences?
Content and labs are identical. Remotely, labs run on cloud environments accessible from a browser, with nothing to install. On-site, you provide the workstations; labs can run in the cloud or locally depending on your infrastructure.
How many participants per session?
3 to 10 participants at most. This deliberate limit ensures everyone can ask questions, adapt the exercises to their context and get a detailed answer.
What is the evening format?
The evening format spreads the same course over 4 sessions of 3.5 hours (14 hours in total), in the evening from 6:30 pm to 10:00 pm. Same content, same labs, same price, so you can build skills without taking days off.
How does payment work?
Courses are invoiced on quote, by bank transfer. Payment in instalments is possible. We issue a training agreement for companies that want their training department to cover the cost.
Interested in this course?
Join the next session or request a tailored in-company session.
What participants say
Not sure this course fits your context?
A 20-minute call to take stock before you enrol, with no sales pitch.