Back to Cookbook
KiloClaw

Merge Conflict Resolver

Resolve conflicts safely and reduce repeat occurrences

Provide a consistent workflow for resolving merge conflicts and preventing recurring conflicts via smaller changes, frequent integration, and safer branching practices.

CommunitySubmitted by CommunityWork10 min

INGREDIENTS

🐙GitHub

PROMPT

Create a skill called "Merge Conflict Resolver". Given: - The conflicting files (git status / PR conflict list) - Branch strategy in use (merge vs rebase) Output: - A step-by-step resolution guide - A post-resolution verification checklist - 3 prevention changes tailored to our workflow (small PRs, frequent integration, policies)

How It Works

Merge conflicts aren't rare — they're a normal part of collaboration. This recipe standardizes

a safe resolution path and adds prevention guardrails.

Triggers

  • PR shows "merge conflict" and stalls
  • Conflicts recur repeatedly across the same files
  • Long-lived branches produce "mega conflicts"

Steps

  1. Identify conflict type (competing line changes vs more complex structural conflicts).
  2. Resolve locally; ensure conflict markers are fully removed.
  3. Run the full relevant test set after resolution (not just compilation).
  4. Reduce future conflicts:
  • smaller PRs,
  • earlier merges,
  • avoid long-lived shared branches,
  • stabilize generated files and lockfile policies.
  1. If a file causes frequent conflicts, consider ownership or modularization.

Expected Outcome

  • Conflicts are resolved without losing changes.
  • Teams spend less time in conflict hell over time.

Example Inputs

  • "PR cannot be merged due to conflicts; guide me through resolution."
  • "Conflicts keep recurring on the same files."
  • "We have long-lived branches; conflict risk is rising."

Tips

  • Always test after conflict resolution; it's easy to silently drop behavior.
Tags:#merge-conflicts#code-review#ci-cd#developer-productivity