What Causes a Merge Conflict

Learn the core situation that forces Git to ask you to resolve a merge conflict manually.

When does Git typically produce a merge conflict during a merge?