Source Tracking And Conflict Resolution includes at least one code block. At roughly 2,484 words the SKILL.md is on the longer end of the catalog distribution.
Source Tracking And Conflict Resolution sits in the Engineering category under the devops sub-topic in the ClaudSkills catalog. There are 10 related skills indexed alongside it; comparing a few before installing usually reveals which fits your workflow best.
These notes are auto-generated from features detected in the SKILL.md file and from this catalog's structure — they aren't part of the source repository.
This skill activates when a practitioner needs to understand, diagnose, or resolve source-tracking conflicts between a local Salesforce DX project and an org using the sf CLI (sf project retrieve start, sf project deploy start). It covers the mechanics of tracking files, conflict detection via SourceMember revision counters, sandbox enablement, force-overwrite and ignore-conflicts flags, and recovery from corrupted tracking state. It does NOT cover Git merge conflicts, DevOps Center pipeline conflicts, or Metadata API-based change-set deployments.
Source Tracking And Conflict Resolution is a community-contributed Claude Code skill in the devops sub-category. It ships as a SKILL.md file that Claude Code auto-discovers under ~/.claude/skills/source-tracking-and-conflict-resolution/ and loads when your prompt matches the skill's trigger.
When to invoke it: Use when diagnosing and resolving SFDX source-tracking conflicts between a local project and a Salesforce org — covering sf project pull/push/retrieve/deploy conflict errors, force overwrite decisions, tracking file corruption, and sandbox source-tracking enablement. Trigger keywords: source tracking, conflict, --force-overwrite, --ignore-conflicts, maxRevision.
The Source Tracking And Conflict Resolution Claude Code skill is built for software engineers, backend developers, full-stack teams, and technical leads building and maintaining production systems. It's part of ClaudSkills (also referred to as Claude Skills or Claude Code Skills) — the open community-curated registry of 146,000+ SKILL.md files for Anthropic's Claude Code agent and the wider Claude ecosystem (Claude API, Claude Agent SDK).
mkdir -p ~/.claude/skills/source-tracking-and-conflict-resolution curl -L https://claudskills.com/skills/source-tracking-and-conflict-resolution/SKILL.md \ -o ~/.claude/skills/source-tracking-and-conflict-resolution/SKILL.md
Or just download SKILL.md directly and drop it into ~/.claude/skills/source-tracking-and-conflict-resolution/. Claude Code auto-discovers it on next session.
Skills live at ~/.claude/skills/source-tracking-and-conflict-resolution/SKILL.md on macOS/Linux, or %USERPROFILE%\.claude\skills\source-tracking-and-conflict-resolution\SKILL.md on Windows. See the full install guide for step-by-step instructions.
Open @claudskills_bot on Telegram, tap Open Desktop App, and the desktop app installs this skill for you. Or share the bot link with a colleague — they get the same one-tap install. Learn more →
The ClaudSkills desktop app installs any skill directly into ~/.claude/skills/ with one click — no terminal required. Pro starts at $9/mo or $149 lifetime.
For the full experience including quality scoring and one-click install features for each skill — upgrade to Pro.
SKILL.md from the source repository to ~/.claude/skills/source-tracking-and-conflict-resolution/SKILL.md and restart Claude Code. Both flows are detailed at claudskills.com/install/.SKILL.md file that lives under ~/.claude/skills/<name>/ and tells the Claude Code CLI agent how to perform a specific task (instructions, prompts, allowed tools). Skills are auto-discovered at session start. Source Tracking And Conflict Resolution is one of 67,000+ skills indexed in the open ClaudSkills catalog, classified under the Engineering category. Learn more at /learn/what-is-a-claude-skill/.If you reference this skill in a blog post, paper, or documentation, you can cite it as:
@misc{source-tracking-and-conflict-resolution-2026,
author = {Pranav Nagrecha},
title = {Source Tracking And Conflict Resolution [Claude Code skill]},
year = {2026},
publisher = {ClaudSkills},
url = {https://claudskills.com/skills/source-tracking-and-conflict-resolution/}
}Grade A · scanned 2026-07-06 — free static scan against the OWASP Agentic Skills Top 10.
No risk patterns were found in any of the ten OWASP-aligned categories. How grading works ›
Browse all Engineering skills in the ClaudSkills registry, or explore these other picks from the same category:
Part of Acreator Store — Adam Lankamer's AI tools: PerfectStudio · Ucaption · UTagger · AutoXPoster · TestYourSkills · AutomationFlows · Au Naturel · Telegram @acreatorstore
SKILL.md files, not affiliated with, endorsed by, or sponsored by Anthropic.