Walk through any Git merge, rebase, or cherry-pick conflict step by step -- understand both sides of the change, get a suggested resolution, and know why it's safe before you commit.
Explains each conflicting hunk in plain language: what each branch was trying to do, whether the changes are actually incompatible or just textually overlapping, and a proposed resolution that keeps both sides' intent where possible. Flags the harder case explicitly -- semantic conflicts that merge cleanly as text but break behavior (e.g. both branches touched the same function differently) -- rather than silently picking one side. Works across git merge, rebase, and cherry-pick conflict markers. Modeled on resolving-merge-conflicts (mattpocock/skills), trending on skills.sh this week at 5.4K installs. Distinct from the existing Systematic Debugger and JetBrains Debugger Integration, which target runtime bugs rather than version-control conflicts.
No account needed · Instant delivery · Secure Stripe checkout
Hand-picked Claude skills + tips for getting more out of your AI tools. No spam, unsubscribe anytime.
Weekly tips on using Claude effectively. Unsubscribe anytime.