Resolve a Merge Conflict

Talk it through with a coach who asks guiding questions and gives hints until you reach the answer. Pass to mark the challenge as completed.

The problem

  • easy
  • Pro

You try to merge the main branch into your feature branch and Git reports a conflict in a file you both changed. Explain why the conflict happened and walk through resolving it safely.

Talk this problem through with an AI coach

This is a Pro challenge. Sign in with Google, then upgrade to start a voice session.

Start free →