InsideEdgeInsideEdge
Download App

Phase 2 · Git & GitHub

Topics

Conflict Resolution

Part of the Full Stack Developer Roadmap.

Summary

The process of manually reconciling two competing changes to the same lines of code when Git can't automatically merge them.

How to Learn This

  • 1Deliberately create a merge conflict between two branches and resolve it by hand.
  • 2Learn to read the `<<<<<<<`, `=======`, `>>>>>>>` conflict markers confidently.
  • 3Use your editor's merge conflict UI (VS Code has a good one) instead of raw text editing.

Previous

Pull Request

Next

GitHub Actions basics

More topics in Git & GitHub

Git initCloneCommitBranchMergeRebaseCherry PickStashPull RequestGitHub Actions basics
InsideEdge

Stuck on this topic? Ask an Insider

Get 1:1 guidance from people who've walked this exact path — free on the InsideEdge app.

Download
InsideEdge