Knowledge Check

Merge conflict evidence

While reviewing git version control, two branches changed one validation rule. Which action fixes it, and which check proves it worked?

What this task practices

Merge conflict evidence is a knowledge check interview exercise that trains prompt interpretation, explicit assumptions, a concrete response, and a clear explanation of tradeoffs. The catalog marks it as hard difficulty. It focuses on Git Version Control, Merge Conflict. The signed-in workspace provides the tools for the round and evaluates the attempt against task-specific criteria. Reference solutions, hidden checks, evaluator instructions, and candidate work remain private.