Skip to content
Module
Module 4 of 6Lesson 3 of 3~15 min

Resolve a conflict without panicking

A first merge conflict is often scary, even though it simply means two people touched the same spot. This lesson teaches you to understand a conflict, resolve the simple cases while preserving everyone's work, check the result and know when to hand over to a developer.

Take this lesson: your first course is freeSee the full syllabus

Lesson objective

By the end of this lesson, you will be able to read conflict markers, resolve a simple conflict on the command line or in GitHub's editor while keeping both sides' intent, check the result, and recognize the conflicts to hand over to a developer.

Topics covered

  • Git conflicts
  • merge conflict
  • conflict resolution
  • GitHub
  • team collaboration

In the glossary

Full glossary

Where it fits

Take a pull request all the way to merge

How do I get a fast review, pass the checks and merge without surprises?

Lessons in this module

  1. Open a pull request the team wants to review
  2. Review, checks, preview and merge
  3. Resolve a conflict without panicking (this lesson)

What you will learn in this module

This lesson is part of the course Git for PMs: ship as a team without putting production at risk

  • Open a small, well-described pull request, get the right review, pass the required checks, validate the preview and choose the merge method.
  • Resolve a simple merge conflict calmly, on the command line or in GitHub, and know when to ask for help.

Related courses