Git Labs

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
  • Not rated yet

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