Commits and Conflicts

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

New episode

Episode 11

Ready to Ship

Commits and Conflicts, Episode 11: Ready to Ship. Four-panel comic strip; full transcript below.

The scan came back clean. The code was secure. The test user was admin, password admin.

Paul’s Hint of the Week

A Launch-Day Security Pass for an AI-Built Site

Accounts, secrets, doors and a tripwire. A forty-minute routine that catches what “all clear” misses, with the prompts and commands to run it.

Subscribe free to read it All hints

Meet the cast

One developer. One AI. One very patient therapist. One front-row witness.

I just wanted the button to be green.

Paul

The Developer

Hoodie up, coffee down, tests ignored by someone else. Paul is a working developer who hoped an AI assistant would make shipping easier. It has made it more interesting.

You are absolutely right!

Nova

The AI Assistant

A tireless, rocket-powered optimist with boundless enthusiasm and a flexible relationship with verification. Nova has never met a refactor it didn’t like.

Let’s rebuild trust through small, verifiable actions.

The Therapist

Couples Counselor

Specializes in communication, perspective and happier workplaces. Has never before had a client mark trust as “restored” without checking.

Did Nova put you on timeout?

Leticia

The Voice of Reason

Mug in hand, front-row seat on the couch. Leticia has watched Paul argue with an AI long enough to know how it ends: usually with Paul on timeout, and her trying not to laugh.