Resolve Git Conflicts
penpot/penpot
Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it.
Calm a heated conflict — in person or in writing — before it does damage, by lowering the temperature instead of winning the point.
MITAuto-check passed
Install Conflict Deescalation
$ npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install mohitagw15856/pm-claude-skills conflict-deescalation --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/conflict-deescalation .claude/skills/conflict-deescalation && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "conflict-deescalation" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalation into .claude/skills/conflict-deescalation/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "conflict-deescalation", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalationType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install mohitagw15856/pm-claude-skills conflict-deescalation --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/conflict-deescalation .agents/skills/conflict-deescalation && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "conflict-deescalation" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalation into .agents/skills/conflict-deescalation/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "conflict-deescalation", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install mohitagw15856/pm-claude-skills conflict-deescalation --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/conflict-deescalation .cursor/skills/conflict-deescalation && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "conflict-deescalation" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalation into .cursor/skills/conflict-deescalation/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "conflict-deescalation", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/mohitagw15856/pm-claude-skills.git --path skills/conflict-deescalation--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install mohitagw15856/pm-claude-skills conflict-deescalation --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/conflict-deescalation .gemini/skills/conflict-deescalation && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "conflict-deescalation" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalation into .gemini/skills/conflict-deescalation/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "conflict-deescalation", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install mohitagw15856/pm-claude-skills conflict-deescalationInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/conflict-deescalation .github/skills/conflict-deescalation && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "conflict-deescalation" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalation into .github/skills/conflict-deescalation/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "conflict-deescalation", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install mohitagw15856/pm-claude-skills conflict-deescalation --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/conflict-deescalation .opencode/skills/conflict-deescalation && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "conflict-deescalation" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/conflict-deescalation into .opencode/skills/conflict-deescalation/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "conflict-deescalation", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
conflict-deescalation- GitHub stars
- 1.4k
- Token cost
- ~1.2k tokens
- SKILL.md length
- 606 words
- Files
- 1
- Skills in repo
- 1,348
- Repo updated
- First seen
- Licence
- MIT
At a glance
Calm a heated conflict — in person or in writing — before it does damage, by lowering the temperature instead of winning the point.
- Works in 7 steps: De-escalate yourself first. You can't… → Find what's really driving it. The… → Acknowledge before you respond. Naming… → …
- Asked help me de-escalate this
- SKILL.md covers What This Skill Produces, Required Inputs, Framework: Lower The… and Output Format, plus 3 more sections
- Instructions only: no scripts, shell commands, URLs or credentials in SKILL.md
What it does
Conflict Deescalation is an agent skill from mohitagw15856/pm-claude-skills. Calm a heated conflict — in person or in writing — before it does damage, by lowering the temperature instead of winning the point. Use when asked help me de-escalate this, this argument is getting heated, calm this situation down, or how do I respond without making it worse. Produces a read on what's actually driving the heat (often an unmet need under the surface argument), the de-escalation moves (acknowledge, slow down, find the shared ground), what to say and what to avoid, and how to steer toward resolution…
Its SKILL.md is about 1.2k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
The repository describes itself as: 1255 professional Agent Skills for Claude, ChatGPT, Gemini, Cursor & Codex — PRDs, postmortems, leases, medical bills, layoffs, go-bags, new countries. Plain markdown, MIT, in… The licence is MIT.
When your agent uses it
- Asked help me de-escalate this
- This argument is getting heated
- Calm this situation down
- How do I respond without making it worse
Example prompts
- “t solve anything while everyone”
- “/conflict-deescalation”
Workflow steps
7 steps, taken from the first numbered list in SKILL.md.
- De-escalate yourself first. You can't calm a conflict while you're activated — a pause, a breath, and dropping your own intensity comes…
- Find what's really driving it. The surface argument is rarely the real issue; underneath is usually a need to feel heard, respected, or…
- Acknowledge before you respond. Naming the other person's feeling ("I can see you're really frustrated") lowers defenses faster than any…
- Slow down and soften. Lower your pace, volume, and intensity; the other person tends to mirror it. Avoid the escalators: defensiveness…
- Find shared ground. Even a small point of agreement shifts it from opponents to collaborators.
- Then move to the issue. Only once the heat drops, steer gently toward resolving the actual thing.
- Know when to disengage. If it won't cool, or there's any safety concern, exiting is the right move — say so.
What it can do on your machine
Read from SKILL.md and the folder at commit 1cbf1f0. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
No scripts in the folder and no shell commands in SKILL.md.
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Conflict Deescalation loads about 1.2k tokens when it runs. Until then it costs about 158 tokens; SKILL.md has 606 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
SKILL.md
The full file from mohitagw15856/pm-claude-skills at commit 1cbf1f0, republished under its MIT licence (© mohitagw15856). 606 words, ~1,197 tokens.
Download SKILL.mdSave it as
.claude/skills/conflict-deescalation/SKILL.md (or your agent's skills folder).- name
- conflict-deescalation
- description
- Calm a heated conflict — in person or in writing — before it does damage, by lowering the temperature instead of winning the point. Use when asked help me de-escalate this, this argument is getting heated, calm this situation down, or how do I respond without making it worse. Produces a read on what's actually driving the heat (often an unmet need under the surface argument), the de-escalation moves (acknowledge, slow down, find the shared ground), what to say and what to avoid, and how to steer toward resolution once the temperature drops — because you can't solve anything while everyone's activated.
Conflict De-escalation
When a conflict is hot, nobody's thinking — you're both defending, not listening, and every reply pours fuel. Winning the point in that state loses the relationship. De-escalation is the skill of lowering the temperature first, so an actual resolution becomes possible. This reads what's really driving the heat, gives you the moves that calm it, and steers toward resolution once people can think again.
What This Skill Produces
- The real driver — what's actually fueling the heat (usually an unmet need — to feel heard, respected, safe — under the surface argument)
- The de-escalation moves — acknowledge the other person's feeling, slow the pace, lower your intensity, and find a shred of shared ground
- What to say / what to avoid — the phrases that calm ("I hear that this matters to you") vs. the ones that escalate (defensiveness, "calm down," being right)
- A path to resolution — how to move toward the actual issue once the temperature has dropped
- A safety note — recognizing when to disengage entirely (it's not de-escalating, or there's a safety risk)
Required Inputs
Ask for these if not provided:
- The conflict — what's happening, with whom, in person or in writing
- What was said — the recent exchange, if you're mid-conflict
- Your goal — calm it and resolve, calm it and pause, or exit safely
- The stakes/relationship — who it's with and how much it matters
- Your state — how activated you are (you may need to de-escalate yourself first)
Framework: Lower The Temperature Before The Point
- De-escalate yourself first. You can't calm a conflict while you're activated — a pause, a breath, and dropping your own intensity comes before anything.
- Find what's really driving it. The surface argument is rarely the real issue; underneath is usually a need to feel heard, respected, or safe. Address that.
- Acknowledge before you respond. Naming the other person's feeling ("I can see you're really frustrated") lowers defenses faster than any argument — people de-escalate when they feel heard.
- Slow down and soften. Lower your pace, volume, and intensity; the other person tends to mirror it. Avoid the escalators: defensiveness, "calm down," and needing to be right.
- Find shared ground. Even a small point of agreement shifts it from opponents to collaborators.
- Then move to the issue. Only once the heat drops, steer gently toward resolving the actual thing.
- Know when to disengage. If it won't cool, or there's any safety concern, exiting is the right move — say so.
Show full SKILL.md (201 more words)Show less
Output Format
Conflict: [what's happening] · with [who] · [in person/writing]
What's really driving it: [the unmet need under the surface argument]. De-escalate
- Calm yourself first: [pause/breath/drop intensity].
- Acknowledge them: "[name their feeling]".
- Slow & soften: [lower pace/intensity] · avoid: defensiveness, "calm down," being right.
- Shared ground: [a point you can agree on]. Then, once it's cooler: [move toward the actual issue]. Disengage if: [it won't cool / any safety concern].
Quality Checks
- Starts with de-escalating oneself
- Identifies the real need under the surface argument
- Leads with acknowledging the other person's feeling
- Includes slowing/softening and the escalators to avoid
- Finds shared ground before problem-solving
- Includes when to disengage / a safety note
Anti-Patterns
- Trying to win the point while it's hot.
- "Calm down" — the classic escalator.
- Defending/counter-attacking instead of acknowledging.
- Jumping to problem-solving before the temperature drops.
- Staying in it when disengaging is the safe move.
Example Trigger Phrases
- "This argument with my partner is getting heated — help me de-escalate."
- "How do I respond to this angry email without making it worse?"
- "A conversation at work is turning into a fight. Calm it down."
- "Someone's yelling at me — how do I lower the temperature?"
- "Help me handle this conflict without it blowing up."
© mohitagw15856, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
Just SKILL.md in skills/conflict-deescalation of mohitagw15856/pm-claude-skills.
Open the folder on GitHubat commit 1cbf1f0
Compare with similar skills
Conflict Deescalation next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Conflict Deescalation this skillmohitagw15856/pm-claude-skills | 1.4k | — | ~1.2k | Automated safety check: Pass | MIT | |
| Resolve Git Conflictspenpot/penpot | 61k | — | ~772 | Automated safety check: Pass | MPL-2.0 | |
| Autoresolving PR ConflictsPostHog/posthog | 40k | — | ~4.2k | Automated safety check: Pass | Custom licence | |
| Adding Warehouse Person PropertiesPostHog/posthog | 40k | — | ~2.9k | Automated safety check: Pass | Custom licence | |
| Drizzle Migration Conflictsickn33/agentic-awesome-skills | 47k | 1 repos | ~2.5k | Automated safety check: Notes | Apache-2.0 | |
| Indexability Conflictsthedaviddias/Front-End-Checklist | 74k | — | ~876 | Automated safety check: Pass | MIT |
Similar skills
- Official
Autoresolving PR Conflicts
PostHog/posthog
Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source…
- Official
Adding Warehouse Person Properties
PostHog/posthog
Sync columns from a synced data warehouse table onto PostHog person or group properties, so warehouse data becomes usable anywhere person and group properties already work: feature flag targeting…
Drizzle Migration Conflict
sickn33/agentic-awesome-skills
Diagnose, repair, and prevent Drizzle Kit migration conflicts involving generated SQL, snapshots, journals, merge queues, and team workflows.
Indexability Conflicts
thedaviddias/Front-End-Checklist
A skill your agent uses when auditing a site for indexability issues, investigating why pages appear in Google's index that should be excluded (or vice versa), or reviewing robots.txt and meta…
Build A Personal Skill From History
THU-MAIC/OpenMAIC
Derives a reusable personal skill for course-making from a representative sample of the user's own past classrooms and chat history, confirmed with them before saving.
More from mohitagw15856/pm-claude-skills
All 1,348 skills in this repoCar Tco
mohitagw15856/pm-claude-skills
Compare the total cost of car ownership across buy-new, buy-used, lease, and keep-your-current-car — depreciation, insurance, maintenance ramp, and fuel over a real horizon, not just the monthly…
Cs Health Scorecard
mohitagw15856/pm-claude-skills
Build a customer health scorecard for a specific account. An agent skill from mohitagw15856/pm-claude-skills.
Exit Waterfall
mohitagw15856/pm-claude-skills
Compute who gets what at each exit price from a cap table — liquidation preferences, conversion points, and where the founders' share collapses.
Feature Prioritisation
mohitagw15856/pm-claude-skills
Apply prioritisation frameworks (RICE, MoSCoW, Kano, ICE, Opportunity Scoring) to rank features and backlog items.
Fire Number
mohitagw15856/pm-claude-skills
Compute a financial-independence (FIRE) target and years-to-reach with every assumption labeled as an assumption — plus a sensitivity table instead of a single false-precision answer.
Freelance Rate
mohitagw15856/pm-claude-skills
Derive a freelance day/hourly rate backwards from target income, honest billable utilization, overhead, and the self-employment tax premium — the arithmetic that proves a rate is not salary÷2000.
Questions about Conflict Deescalation
What does Conflict Deescalation do?
Calm a heated conflict — in person or in writing — before it does damage, by lowering the temperature instead of winning the point. Conflict Deescalation is an agent skill from mohitagw15856/pm-claude-skills. Calm a heated conflict — in person or in writing — before it does damage, by lowering the temperature instead of winning the point.
When should I use Conflict Deescalation?
Conflict Deescalation fits situations like: asked help me de-escalate this; this argument is getting heated; calm this situation down; how do I respond without making it worse.
How do I install Conflict Deescalation in Claude Code?
Run `npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a claude-code`. Or copy the skill folder (skills/conflict-deescalation in mohitagw15856/pm-claude-skills) into .claude/skills/conflict-deescalation in your project. Claude Code loads it when a task matches its description.
How do I install Conflict Deescalation in Codex?
Run `npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a codex`. Or copy the skill folder (skills/conflict-deescalation in mohitagw15856/pm-claude-skills) into .agents/skills/conflict-deescalation in your project. Codex loads it when a task matches its description.
Can I use Conflict Deescalation in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add mohitagw15856/pm-claude-skills --skill conflict-deescalation -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/conflict-deescalation, .gemini/skills/conflict-deescalation, .github/skills/conflict-deescalation and .opencode/skills/conflict-deescalation in your project.
What does Conflict Deescalation need to run?
SKILL.md names no scripts, command-line tools or credentials: Conflict Deescalation is instructions for the agent only.
Does Conflict Deescalation access the network?
SKILL.md contains no URLs. Any network use would come from the scripts or tools the agent runs. This is read from the text; nothing was executed.
Is Conflict Deescalation safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Conflict Deescalation use?
Conflict Deescalation is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Conflict Deescalation use?
About 1.2k tokens (SKILL.md is roughly 4.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Conflict Deescalation?
Skills that share tags, products or a category with Conflict Deescalation: Resolve Git Conflicts (penpot/penpot, 61k stars), Autoresolving PR Conflicts (PostHog/posthog, 40k stars), Adding Warehouse Person Properties (PostHog/posthog, 40k stars) and Drizzle Migration Conflict (sickn33/agentic-awesome-skills, 47k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Conflict Deescalation?
mohitagw15856 (a GitHub user) maintains it in mohitagw15856/pm-claude-skills, which has 1,434 GitHub stars. The repository holds 1,348 skills in this directory. The repository was last updated on October 9, 2026.
Source: mohitagw15856/pm-claude-skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.