Merge Conflict
HEAD or incoming? Or both? Read the context and resolve it clean — against the clock.
Resolved 0 0
Read the context, then keep HEAD, the incoming change, or both — before the timer runs out. Three bad merges and you're done.
HEAD or incoming? Or both? Read the context and resolve it clean — against the clock.