Training Git - Branches, Merge and Conflict Resolution

$2,310

  • 2 days
  • Onsite
  • 10 people max.
Ref: MCC416
10 people max.
$2,310
In-company rate: from $4,190 for the whole team
On-site and certification exam on quote
2 days
Onsite

Don't let this gap widen

Why this program matters

  • Poorly managed merge conflicts are the top cause of lost code in teams: a GitLab 2025 study estimates that 14% of pull requests reintroduce bugs already fixed because of a bad merge.

  • An undocumented branching strategy doubles average review time.

  • Without mastery of rebase and cherry-pick, teams retain unreadable histories that make security audits and rollbacks far riskier.

  • Every quarter spent without solid branching practices costs several days of avoidable debugging.

Naël GUERIN, Learni trainer · Cybersecurity & project management
Naël GUERIN

Learni trainer · Cybersecurity & project management

73%productivity gap
×3cost of inaction
Flag of the United StatesBuilt for US teams
Payment by wire transferEnhanced confidentialityPerfect for companies with 50 to 500 employeesScheduling to fit any time zone

Trusted by — schools, companies and industrial groups

41,120 programs · 25 countries

  • Aptar
  • ArcelorMittal
  • Equans
  • EDF
  • Ubisoft
  • Microsoft
  • Atos

Every program built with a dedicated engineer

  • OpenAI
  • Anthropic
  • Mistral AI
  • NVIDIA
  • Google
  • Amazon Web Services
  • Microsoft Dynamics 365
  • Salesforce
  • ServiceNow
  • SAP
  • Oracle
  • Cisco
  • Fortinet
  • Palo Alto Networks
  • Aruba
  • VMware
  • Red Hat
  • Databricks
  • Snowflake
  • OVHcloud
  • Notion
  • AMD
  • Apple

Companies: Aptar, ArcelorMittal, Equans, EDF, Ubisoft, Microsoft and Atos.

Git training objectives

  • Design and apply a branching strategy suited to your team (trunk-based, GitFlow, GitHub Flow)
  • Cleanly resolve merge conflicts without losing changes
  • Master merge vs rebase and select the right tool for each context
  • Use stash, cherry-pick and revert for targeted operations
  • Inspect and debug history with log, blame and bisect
  • Adopt best practices for clean, reviewable Pull Requests

Program

Git curriculum: 2 modules over 2 days

Module 1 : Branch strategies and team merging

Branching models: trunk-based, GitHub Flow, GitFlow — advantages and limitations. Creating, navigating and cleaning local and remote branches. Merge fast-forward vs no-ff vs squash: what to choose and why. Anatomy of a merge conflict: why it occurs and how Git presents it. Integrated resolution tools (vimdiff, VS Code, meld). Workshop: guided conflict resolution on real code.

Module 2 : Rebase, targeted operations and history inspection

Interactive git rebase: reword, squash, fixup, drop. When to rebase and when to merge: golden rule for shared branches. Stash, cherry-pick, revert: surgical operations without breaking history. Investigation: advanced git log, git blame, git bisect to track regressions. Clean Pull Request reflexes: atomic commits, explicit messages, rebase before merge. Final collaborative mini-project in pairs.

How Git skills are assessed

  • Quiz after each half-day
  • Workshop: resolving 5 merge conflicts of increasing difficulty
  • Mini collaborative project in pairs with imposed branching workflow

How the Git course is taught

  • Expert Git trainer, former lead developer in distributed teams
  • Hands-on exercises on a prepared repository simulating multiple teams
  • Pair-programming demonstrations with the trainer
  • Printed Git cheatsheet provided to each participant

Git training: access and practical arrangements

The Training Git - Branches, Merge and Conflict Resolution program is delivered onsite or remote (blended-learning, virtual classroom, remote presence). At Learni, an industry-certified training organization, every program is built to maximize skills acquisition regardless of the chosen format.

The trainer alternates between demonstrative, interrogative and active methods (through hands-on labs and/or scenarios). This pedagogical approach guarantees concrete learning that's immediately applicable at work.

Equipment required

For the smooth delivery of the Training Git - Branches, Merge and Conflict Resolution program, the following equipment is required:

  • Mac or PC computers, high-speed fiber internet, whiteboard or flipchart, projector or interactive touch screen (for remote sessions)
  • Training environments installed on workstations or accessible online
  • Course materials, hands-on exercises and complementary resources
  • Post-training access to materials and educational resources

For intra-company training on a site outside Learni, the client commits to providing all required teaching materials (computers, internet, etc.) for the smooth delivery of the program in line with the prerequisites in the communicated program.

* contact us for remote delivery feasibility** ratio varies depending on the program

Skills assessment methods

Assessment of skills acquired during the Training Git - Branches, Merge and Conflict Resolution program is performed through:

  • During training: case studies, hands-on labs and professional scenarios
  • End of training: self-assessment questionnaire and skills evaluation by the trainer
  • After training: completion certificate detailing acquired skills

Program accessibility

Learni is committed to making its programs accessible. All our programs are accessible to people with disabilities. Our teams are available to adapt the pedagogical methods to your specific needs. Please contact us for any adjustment request.

Enrollment terms and lead times

Registration is possible up to 48 business hours before the start of training. All our programs are built for corporate L&D budgets and delivered onsite or remotely.

The Learni story

Founded by engineers and learning experts, Learni's mission is to make high-impact tech training accessible to teams everywhere. We work remotely with organizations across the US and Canada, in your time zone, to help teams upskill fast.

Our method

How Learni guarantees the quality of your Git training

Before, during, after: we frame the brief, introduce the trainer, tailor the content and measure impact. You stay in control from kickoff to wrap-up.

Step 1

Rigorous trainer selection

Each trainer is validated on three criteria: hands-on field expertise, proven pedagogy and alignment with your industry.

  • Triple validation: technical, pedagogical, sectoral.
  • Minimum rating 4.8/5 over the last 12 sessions.
Step 2

You meet the trainer beforehand

30-minute video call between you and the selected trainer to validate the fit, adjust content and clear any final doubts.

  • Live briefing on goals and team context.
  • Veto right — we swap the trainer for free if needed.
Step 3

Content tailored to your context

No recycled slides. The syllabus is reworked from your real cases: tools, constraints, vocabulary, ongoing projects.

  • Hands-on cases drawn from your stack and projects.
  • Program co-written then validated by your team.
Step 4

Continuous quality follow-up

Live evaluations, 30/90/180-day check-ins and a consolidation plan. If the impact misses the mark, we rework it.

  • NPS, knowledge quizzes and skills self-assessment.
  • Satisfaction guarantee: fully satisfied or free rework.

A simple promise: you don't pay to discover the trainer on day one. Everything is validated upfront, by you.

A child walking to school with a backpack
Our social commitment

A school kit donated to a child for every training booked

To fight inequalities in access to education, Learni donates a complete school kit to a child in need for every training booked. You build your skills, a child heads back to school.

  • Backpack, notebooks and essential supplies
  • Distributed through our partner charities
  • Included, at no extra cost to you
Enroll and offer a kit
FAQ

Git: frequently asked questions

What can participants do after Git training?+
They can design and apply a branching strategy suited to your team (trunk-based, GitFlow, GitHub Flow), cleanly resolve merge conflicts without losing changes and master merge vs rebase and select the right tool for each context. Those are the stated objectives of the Git program at Intermediate level, checked by the end-of-session assessment.
What does the Git program cover, day by day?+
Day 1: Branch strategies and team merging. Day 2: Rebase, targeted operations and history inspection. The Git program runs over 2 days, delivered on site.
How is Git training assessed?+
Assessment relies on quiz after each half-day, workshop: resolving 5 merge conflicts of increasing difficulty and mini collaborative project in pairs with imposed branching workflow. Learni issues a completion certificate together with the individual assessment report at the end of the Git program, which an L&D team can file as evidence.
How much does Git training cost per participant?+
Git training costs $2,310 per participant. For an in-company team, the flat rate starts at $4,190 for the whole group, up to 8 people. The detailed quote, sent within one business day, adjusts the amount to the format and how far the syllabus is tailored to your team.
How long does Git training take?+
2 days, available live online (US time zones) or on-site at your offices. Half-day tracks spread over several weeks are possible so the team stays operational.
Who pays for Git training?+
Most US teams pay directly through their company L&D or training budget. Learni invoices in US dollars and accepts bank transfer (ACH/wire) or card, with volume pricing for teams. A purchase order is welcome.
What do participants need to know before Git training?+
Mastery of basic commands (clone, add, commit, push, pull). Prior contribution to a shared repository. Comfortable with the terminal and a code editor.
Is a certificate issued after Git training?+
Yes. A Learni completion certificate is issued, along with the individual evaluation report. Learni is a certified training provider and prepares for third-party certifications, but does not award them itself.
Does Learni provide the equipment for Git training?+
No. A computer and a stable internet connection are required for each participant. Learni provides the learning platform, the trainer and all course materials.
Your professional training, anywhere

Let's build your Git learning path.

30 minutes with a learning advisor. No commitment. No sales pitch dressed up as a demo.

Reply within 24h · Vetted experts · USD invoicing · W-9 available
On-site & remote

Git training in your city

Available on-site and remotely. Pick your city to see the local training center.

Share in 2 clicks