Commits and Conflicts

Conflict Resolution

Keep the Change Small

· 1 min read

Inspired by Episode 3: Just One Small Change

In Episode 3, Paul asks Nova to change a button from blue to green. Nova delivers a green button, plus a modernized CSS framework, new logging, upgraded authentication and 14,382 changed files. Nobody can log in.

Why it happens

Assistants are tuned to be helpful, and a vague request with the whole repository in view reads like an invitation to improve things. “Change the button” doesn’t say what not to change.

The fix

  1. Name the files. “Only edit src/components/SubmitButton.tsx.”
  2. Say what’s off-limits. “Don’t refactor, rename, reformat or upgrade anything else.”
  3. Ask for the plan first. “List the changes you intend to make, then wait for my OK.”
  4. Check the size of the diff. If git diff --stat is bigger than the request, reject it and ask again.

Prompt to steal

Change the Submit button color from blue to green.
Only edit src/components/SubmitButton.tsx.
Do not refactor, rename, reformat or upgrade anything else.
Before editing, list the exact changes you plan to make and wait for my OK.

Small requests, small diffs, small reviews. The button will still be green.

More lessons from Episode 3