S

Satya • 3.38K Points
Extraordinary

Q. What is a 'conflict' in Git?

  • (A) A type of commit
  • (B) A mismatch between different GitHub versions
  • (C) When Git cannot automatically merge changes
  • (D) A deleted repository
  • Correct Answer - Option(C)
  • Views: 15
  • Filed under category GitHub
  • Hashtags:
Explanation by: Satya
A conflict occurs when changes in different branches affect the same lines and Git cannot merge them automatically.

You must be Logged in to update hint/solution

Discusssion

Login to discuss.

Be the first to start discuss.