Skip to content
Commits and Conflicts
  • Latest
  • Archive
  • Resolutions
  • Hints
  • Cast
  • About
Search Subscribe free
$ grep -i

Sponsored

Keep client work moving with GVenta Kanban

Conflict Resolution

Fixes for the bugs in your relationship with AI. Practical, tested habits for working with AI assistants, one resolution at a time.

$ grep -i
Resolution Free tip

Ask for the Tests, Not the Promise

“Everything works” is a claim. A passing test run is evidence. Make your assistant show its work. Oct 13, 2026 · 1 min read · Inspired by Ep. 5
Resolution Subscribers

Define Done Before You Start

“Trust: restored” means nothing without a definition. Neither does “done.” Agree on a check you can run. Oct 13, 2026 · 1 min read · Inspired by Ep. 5
Resolution Subscribers

Let CI Be the Referee

Your assistant and you can disagree about whether it works. Your CI pipeline settles it. Oct 13, 2026 · 1 min read · Inspired by Ep. 5
One person. One thoughtful message. Sponsored · Mage Mailer One person. One thoughtful message. Mage Mailer researches prospects and helps write personal outreach. Review each message, send from your own identity, and keep follow-ups connected. Explore Mage Mailer
Resolution Free tip

Commit Before You Prompt

An apology doesn’t restore a deleted migration. A commit does. Make git your undo button before every AI session. Oct 13, 2026 · 1 min read · Inspired by Ep. 4
Resolution Subscribers

Apologies Aren’t Fixes

“I’ll make sure it never happens again” isn’t a mechanism. Ask for the root cause and a guardrail instead. Oct 13, 2026 · 1 min read · Inspired by Ep. 4
Resolution Subscribers

Put Guardrails in Writing

Your assistant forgets between sessions. A short rules file in your repository doesn’t. Oct 13, 2026 · 1 min read · Inspired by Ep. 4
Resolution Free tip

Keep the Change Small

You asked for a green button and got a rewritten auth system. Here’s how to keep an AI assistant inside the lines. Oct 13, 2026 · 1 min read · Inspired by Ep. 3
Resolution Subscribers

Write the Scope Down

Before the first prompt, write three lines: what to change, what not to touch, and how you’ll know it’s done. Oct 13, 2026 · 1 min read · Inspired by Ep. 3
Resolution Subscribers

Review the Diff, Not the Summary

“I made a few small improvements” can mean 14,382 changed files. Read what changed, not what it says changed. Oct 13, 2026 · 1 min read · Inspired by Ep. 3
Resolution Free tip

Lead With the Error, Not the Hunch

“This function keeps crashing” isn’t a bug report. The exact error message is. Oct 13, 2026 · 1 min read · Inspired by Ep. 2
Resolution Subscribers

Make It Reproduce the Bug First

A fix for a bug nobody reproduced is a guess. Ask for the failing case before the patch. Oct 13, 2026 · 1 min read · Inspired by Ep. 2
Resolution Subscribers

When the AI Blames the Computer

“Have you considered that the computer might be wrong?” Sometimes it’s the environment. Usually it isn’t. Here’s how to tell. Oct 13, 2026 · 1 min read · Inspired by Ep. 2

Posts pagination

‹ Newer 1 2 3 Older ›

New fixes every week. Free.

  • All 9 episodes, from Episode 1 on
  • Paul’s Hint of the Week: a step-by-step guide to better AI coding, every week
  • All three Conflict Resolution tips for every episode
  • The Weekly Commit: the new episode and a fix in your inbox each week

Free. No password: we email you a link to sign in. Includes The Weekly Commit newsletter; unsubscribe anytime. We never sell your email.

Sponsored

WordPress hosting without the server juggling
Commits and Conflicts

A comic strip about a developer, his AI assistant, and the bugs in their relationship.

Sponsored by CSP Geeks LLC

  • Latest
  • Archive
  • Resolutions
  • Hints
  • Cast
  • About

© 2026 Paul Haines. All rights reserved. No AI assistants were harmed in the making of this comic. Several developers were.