🎁Azure · AWS · Google — 1 free certification per learner, up to $400.Get the offer →
← Back

Training Git - Branches, Merge and Conflict Resolution

Ref: MCC416
10 people max.
$2,640 HT / per person
−15% from 2 people−30% from 3 people−50% from 5 people
Pay in 3 installments · +$180/day onsite · +$540 with certification exam
2 days
in-person

Share in 2 clicks

EquansAptarArcelorMittalUbisoftINSEECLa PlateformeCESIEFREIEPSIINGETISMy Digital SchoolYnovEquansAptarArcelorMittalUbisoftINSEECLa PlateformeCESIEFREIEPSIINGETISMy Digital SchoolYnov

Learning 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

The Learni story

Founded by passionate learning and innovation experts, Learni's mission is to make professional training accessible to everyone, anywhere in the world. Our team operates in major hubs — London, New York, Boston — and internationally, to support talents and organizations in upskilling.

Don't let this gap widen

Why this program matters

  • Without this upskilling, your team accumulates a technological gap that translates directly into productivity loss.

  • Organizations that don't train their talents on key topics see their competitiveness drop.

  • Every quarter without training is a gap widening with competitors who invest.

  • The cost of inaction quickly exceeds that of well-targeted training.

Allan Busi
Allan Busi

Learni Trainer · Expert

73%productivity gap
×3cost of inaction

Program

Module 1Branch 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 2Rebase, 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.

Evaluation method

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

Learning method

  • 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

Methods, materials and delivery

The Training Git - Branches, Merge and Conflict Resolution program is delivered onsite or remote (blended-learning, e-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 eligible for corporate training budgets and employer-funded plans.

Verified reviews

What our learners

4.9 · +100 verified reviews
★★★★★

« cool, j'ai appris des trucs »

TomFormation AWS — Cloud Practitioner
★★★★★

« j'etais perdu au debut mais Ramy Saharaoui m'a pas laché, il a pris le temps. merci vraiment »

Eva CarpentierFormation LLM en Entreprise — Claude, ChatGPT, Mistral
★★★★★

« la formation dev etait intense mais grave bien. merci Anthony Khelil »

NolanDWWM - Développeur Web et Web Mobile
★★★★★

« 😊👍 »

AmbreDWWM - Développement Web & Mobile React
★★★★★

« bien 👍 »

Léo BlanchardFormation AWS — DevOps Engineer Professional
★★★★★

« Allan Busi t'es au top, continue comme ça. formation géniale »

MargotFormation Claude & ChatGPT — Comparatif et Cas d'Usage
★★★★★

« cool, j'ai appris des trucs »

TomFormation AWS — Cloud Practitioner
★★★★★

« j'etais perdu au debut mais Ramy Saharaoui m'a pas laché, il a pris le temps. merci vraiment »

Eva CarpentierFormation LLM en Entreprise — Claude, ChatGPT, Mistral
★★★★★

« la formation dev etait intense mais grave bien. merci Anthony Khelil »

NolanDWWM - Développeur Web et Web Mobile
★★★★★

« 😊👍 »

AmbreDWWM - Développement Web & Mobile React
★★★★★

« bien 👍 »

Léo BlanchardFormation AWS — DevOps Engineer Professional
★★★★★

« Allan Busi t'es au top, continue comme ça. formation géniale »

MargotFormation Claude & ChatGPT — Comparatif et Cas d'Usage
★★★★★

« cool, j'ai appris des trucs »

TomFormation AWS — Cloud Practitioner
★★★★★

« j'etais perdu au debut mais Ramy Saharaoui m'a pas laché, il a pris le temps. merci vraiment »

Eva CarpentierFormation LLM en Entreprise — Claude, ChatGPT, Mistral
★★★★★

« la formation dev etait intense mais grave bien. merci Anthony Khelil »

NolanDWWM - Développeur Web et Web Mobile
★★★★★

« 😊👍 »

AmbreDWWM - Développement Web & Mobile React
★★★★★

« bien 👍 »

Léo BlanchardFormation AWS — DevOps Engineer Professional
★★★★★

« Allan Busi t'es au top, continue comme ça. formation géniale »

MargotFormation Claude & ChatGPT — Comparatif et Cas d'Usage
Read all reviews
Our method

Training quality, guaranteed at every step

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.

Your professional training, anywhere

Let's build
your next
program.

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

Reply within 24 h · Industry-certified · Corporate funding
WhatsApp