It's 4:47 PM on a Friday. You've been coding all week on a feature you're proud of. You open a PR, and GitHub greets you with the one message that turns your stomach:
"This branch has conflicts that must be resolved."
You already know what's waiting. The pom.xml has diverged again. Someone on main bumped a YAML config. There are three Markdown docs with ugly <<<<<<< HEAD markers scattered through them. You're not shipping today.
Every software developer has lived this moment. And most of us keep solving it the same slow, error-prone, manual way — every single time.
This post is about why that's a problem, and how the /resolve-conflicts skill for Claude in Cowork mode fixes it by automating the entire workflow.
The Real Pain Points Behind Merge Conflicts
Merge conflicts feel like a Git problem, but they're really a team coordination problem made visible. Here's what actually makes them brutal:
They always hit at the worst time.…