Conflict Resolution

Review the Diff, Not the Summary

Inspired by Episode 3: Just One Small Change

You’re reading a subscriber article on a free read. That was your last free read. Subscribe free for the whole archive.

An assistant’s summary of its changes is its own description of its own work. The diff is the record.

A two-minute review

git diff --stat          # how big is this, really?
git diff --name-only     # any surprise files?
git diff -- src/ui/      # read the part you asked for
  • Size check: does the number of changed files match the request?
  • Surprise check: lockfiles, configs, auth, migrations. Did any of those change?
  • Keep or revert per file: git restore path/to/file drops changes you didn’t ask for.

If the diff is too big to review, it’s too big to merge. Ask for a smaller one.

More lessons from Episode 3