Resolve Conflicts by Intent
Tell Claude what each side of a conflict was for and which wins, so both intents survive the merge.
Where you'll practice this
One Promptles scenario teaches this principle directly.
Resolve the Config Conflict
Merging `main` into your `feature/webhook-retry` branch stopped on a conflict in `src/config.ts`. Both sides changed the same block of lines (git calls that block a hunk). On `main`, Luca raised `MAX_RETRIES` from 3 to 5 after booking webhooks timed out during league sign-ups;…
Other principles in Context
Declare the Tools You Need
Name the connected source and what to do if it's unreachable. Access itself comes from the connection, not the prompt.
Describe Before You Prescribe
Say what happens now and what should happen instead, so Claude changes only the gap.
Describe Relationships
Say how your data connects and what happens on delete. Those are business decisions only you can make.
Explain the Integration Point
Describe the handoff: what starts it, what crosses, and what happens on a failure or a duplicate.
Follow an Existing Pattern
Point at something already done right and ask Claude to match it and reuse it.
Map to Real Components
Ask Claude to reuse the components you already ship, not build look-alike copies.