Git Labs· Module 2 — Branching and IntegrationLab 11 of 36

Resolve a Content Conflict

You and Alice changed the same line. Merge her branch, resolve the conflict to the value the team agreed, and keep the rest of her work.

  • Beginner
  • 25 min
  • 1.0 out of 5 · 1 ratings
  • Free
Start labPart of Git hands-on labs

Free with a free account — it runs in your browser, nothing to install.

  • A real environment in your browser
  • You run the commands yourself
  • Your result is checked automatically

In this moduleModule 2 — Branching and Integration

  1. Create a Health-Check Feature Branch25 min
  2. Compare and Merge Completed Work20 min
  3. Handle an Urgent Interruption with Stash25 min
  4. Resolve a Content ConflictYou are here
  5. Resolve a Modify/Delete Conflict25 min
  6. Compare Fast-Forward and Three-Way Merges25 min