# Guided Exercise: Decide the Resolution Before You Touch the File

This is a paper exercise — commit to a decision before resolving anything in the Lab.

## Your task

A merge conflict shows:

```
<<<<<<< HEAD
timeout_seconds = 30
=======
timeout_seconds = 120
>>>>>>> feature
```

You know `main`'s value (30) was set deliberately for production safety, but `feature`'s value
(120) was added while debugging a slow endpoint that genuinely needs more time. Write out: what
final content would you put in the file, and why is that the RIGHT resolution (not just "pick
one side")?

## A worked shape to check yourself against

A well-reasoned resolution here is neither side alone: something like keeping `30` as the
DEFAULT but adding a comment or a separate, more specific setting for the slow endpoint
specifically — the point is that conflict resolution sometimes means genuinely combining intent
from both sides, not mechanically picking `HEAD` or the incoming branch. There's no single
"correct" file content — the value is in justifying whichever choice you make with real
reasoning, not defaulting to whichever side happens to be `HEAD`.

## Instructor Notes

**Facilitation:** The point of this exercise is resisting "just pick a side" as a reflex —
some conflicts genuinely require combining or renegotiating intent, not mechanical selection.

**Approximate timing:** 8-10 minutes live discussion; 5 minutes self-paced.