Skills conflict-resolver
📦
conflict-resolver
Content revision r1 High Risk ⚙️ External commands🌐 Network access📁 Filesystem access
Resolve Git Merge Conflicts
Merge conflicts slow delivery and create risk when developers choose changes without context. This skill helps Claude, Codex, and Claude Code analyze conflicts, compare intent, and plan safe resolutions.
Supports: Claude Codex Code(CC)
Stop for confirmation before installing.
Review the plan and obtain explicit user consent before changing files.
Install with my Agent
Copy this request to your Agent. It includes the canonical Skill page and manifest.
Agent request
Review the Skillstore skill "conflict-resolver" from https://skillstore.io/skills/curiouslearner-conflict-resolver.md and its manifest at https://skillstore.io/api/skills/curiouslearner-conflict-resolver/manifest. Verify the artifact. Stop and obtain explicit user consent before installing or changing files.Your Agent should still show its plan and request any confirmation required by the security policy.
Agent-readable resources
Use these links when an AI agent, crawler, or script needs clean context instead of reading the full page.
Test it
Using "conflict-resolver". A React import conflict where both branches add different imports.
Expected outcome:
The skill identifies both needed imports, preserves the correct hook path, and recommends linting the file.
Using "conflict-resolver". A package file conflict where one branch changes the version and another adds a script.
Expected outcome:
The skill recommends keeping the newer version, retaining both script entries, and running package checks after review.
Using "conflict-resolver". A rebase with repeated conflicts in moved and modified files.
Expected outcome:
The skill groups the conflicts, suggests resolving one file at a time, and recommends recording repeated safe choices.
Security Audit
High Riskv8 • 7/5/2026 Open versioned report
Most static hits are Markdown fences, conflict markers, or illustrative application code and were marked false positive. Specific command guidance was confirmed where it can mutate repositories, change global Git settings, or execute package scripts. No prompt injection or data exfiltration intent was found.
1
Files scanned
781
Lines analyzed
19
Review items
0
False positives ignored
Confirmed security concerns (3)
High
Project Script Execution During Validation
The checklist and verification script recommend npm lint, test, and build commands. In untrusted repositories, package scripts can execute arbitrary local code.
The cited lines explicitly invoke npm run lint, npm test, and npm run build as validation steps.
Medium
Automated Conflict Resolution Can Discard Work
The suggested auto-resolution script checks out ours or theirs and stages files using whitespace heuristics. This can silently discard one side of a conflict if an agent runs it without review.
The script directly uses git checkout --ours/--theirs and git add inside an automated loop over conflicted files.
Medium
Persistent Global Git Configuration Changes
The skill recommends global Git configuration changes for merge behavior and tools. These changes persist beyond one repository and can surprise later workflows.
Both cited sections use git config --global for merge settings, rerere, and merge tool preferences.
Capability review items (19)
These are real local capabilities that may be expected for this skill, so they require review but are not counted as confirmed malicious behavior.
High
Ruby/shell backtick execution
```bash
The verification checklist recommends npm run lint, npm test, and npm run build. In an untrusted repository, package scripts can execute arbitrary local code.
High
Ruby/shell backtick execution
```bash
The verification script runs npm lint, test, and build commands after checking markers. Project-controlled npm scripts can execute arbitrary code and require user confirmation.
High
Unix shell invocation
#!/bin/bash
The shebang starts a verification script that later runs project-controlled npm scripts. Executing it in an untrusted repository can run arbitrary local code.
Medium
Ruby/shell backtick execution
```bash
The surrounding bash example recommends git checkout --ours and git add, which can overwrite conflict content and stage changes. This is legitimate conflict tooling but requires explicit user confirmation.
Medium
Ruby/shell backtick execution
```bash
The surrounding bash example recommends git checkout --theirs and git add, which can overwrite conflict content and stage changes. This is legitimate conflict tooling but requires explicit user confirmation.
Medium
Ruby/shell backtick execution
```bash
The command block changes global Git merge-tool configuration and includes git clean -f, which can remove untracked files. These are real repository and environment integrity risks if run automatically.
Medium
Ruby/shell backtick execution
```bash
The command block includes git checkout --ours/--theirs, git add ., git commit, and merge continuation or abort commands. These mutate repository state and can discard conflict content if run without review.
Medium
Ruby/shell backtick execution
```bash
The merge-tool command block includes checkout of one binary version and staging that file. This can discard the other side of a binary conflict and should require user confirmation.
Medium
Ruby/shell backtick execution
```bash
The auto-resolution script checks out ours or theirs and stages files based on simple heuristics. It can discard one side of a conflict if an agent runs it without human review.
Medium
Ruby/shell backtick execution
```bash
The command block changes global Git configuration for merge behavior and conflict style. Persistent global settings are a real environment-change risk if applied automatically.
Medium
Ruby/shell backtick execution
```bash
The rebase workflow runs fetch, rebase, git add, and rebase continuation commands. These commands change branch history or repository state and need explicit user approval.
Medium
Ruby/shell backtick execution
```bash
The example uses git add -p and git commit, which change the index and repository history. This is normal Git usage but should not be run by an agent without confirmation.
Medium
Ruby/shell backtick execution
```bash
The moved-file conflict example uses git checkout --theirs and git rm. These commands can delete or replace files and should not be automated without review.
Medium
Ruby/shell backtick execution
```bash
The deleted-versus-modified example uses git rm or git add to choose one side of a conflict. This can discard file content and requires user confirmation.
Medium
Ruby/shell backtick execution
```bash
The binary conflict example uses git checkout --ours or --theirs and stages the selected file. This discards the other binary version if applied without review.
Medium
Ruby/shell backtick execution
- **Pull latest changes**: `git fetch && git pull`
The inline best practice includes git fetch && git pull, which can modify local refs and working tree state. It is standard Git usage but should not run automatically.
Medium
Ruby/shell backtick execution
```bash
The Git configuration block changes global merge behavior and tool preferences. Persistent global configuration changes need explicit approval.
Medium
Template literal with command substitution
```bash
The auto-resolution script checks out ours or theirs and stages files based on simple heuristics. It can discard one side of a conflict if an agent runs it without human review.
Medium
Unix shell invocation
#!/bin/bash
The shebang introduces an executable auto-resolution script that performs Git checkout and staging operations. The script is legitimate but can mutate files without per-file confirmation.
Risk Factors
⚙️ External commands (85)
SKILL.md:62-68 SKILL.md:68-74 SKILL.md:74-82 SKILL.md:82-86 SKILL.md:86-87 SKILL.md:87-88 SKILL.md:88-94 SKILL.md:94-103 SKILL.md:103-112 SKILL.md:112-121 SKILL.md:121-130 SKILL.md:130-139 SKILL.md:139-143 SKILL.md:143-153 SKILL.md:153-160 SKILL.md:160-168 SKILL.md:168-171 SKILL.md:171-174 SKILL.md:174-179 SKILL.md:179-182 SKILL.md:182-187 SKILL.md:187-188 SKILL.md:188-196 SKILL.md:196-199 SKILL.md:199-201 SKILL.md:201-202 SKILL.md:202-209 SKILL.md:209-214 SKILL.md:214-235 SKILL.md:235-238 SKILL.md:238-248 SKILL.md:248-253 SKILL.md:253-269 SKILL.md:269-272 SKILL.md:272-281 SKILL.md:281-289 SKILL.md:289-308 SKILL.md:308-311 SKILL.md:311-325 SKILL.md:325-331 SKILL.md:331-357 SKILL.md:357-360 SKILL.md:360-377 SKILL.md:377-383 SKILL.md:383-400 SKILL.md:400-403 SKILL.md:403-414 SKILL.md:414-420 SKILL.md:420-433 SKILL.md:433-437 SKILL.md:437-456 SKILL.md:456-460 SKILL.md:460-474 SKILL.md:474-480 SKILL.md:480-525 SKILL.md:525-529 SKILL.md:529-540 SKILL.md:540-543 SKILL.md:543-554 SKILL.md:554-560 SKILL.md:560-570 SKILL.md:570-574 SKILL.md:574-580 SKILL.md:580-584 SKILL.md:584-589 SKILL.md:589-593 SKILL.md:593-603 SKILL.md:603-609 SKILL.md:609-625 SKILL.md:625-629 SKILL.md:629-649 SKILL.md:649-655 SKILL.md:655-671 SKILL.md:671-675 SKILL.md:675-689 SKILL.md:689-693 SKILL.md:693-706 SKILL.md:706-711 SKILL.md:711-712 SKILL.md:712-732 SKILL.md:732-750 SKILL.md:518 SKILL.md:480-525 SKILL.md:481 SKILL.md:630
🌐 Network access (3)
📁 Filesystem access (1)
Audited by: codex View Audit History →
Share & cite this report
Share the versioned assessment report, neutral badge, embed card, and citations. Skillstore reports evidence without deciding whether this Skill is safe.
Copy report link
https://skillstore.io/skills/curiouslearner-conflict-resolver/audits/8?utm_source=security_passport&utm_medium=share&utm_campaign=versioned_reportMarkdown badge
[](https://skillstore.io/skills/curiouslearner-conflict-resolver?utm_source=security_passport_badge)HTML badge
<a href="https://skillstore.io/skills/curiouslearner-conflict-resolver?utm_source=security_passport_badge"><img src="https://skillstore.io/badges/skills/curiouslearner-conflict-resolver/security.svg" alt="Skillstore security assessment" loading="lazy"></a>Embed card
<iframe src="https://skillstore.io/embed/skills/curiouslearner-conflict-resolver.html" title="Skillstore Security Assessment" sandbox="allow-popups allow-popups-to-escape-sandbox" loading="lazy" referrerpolicy="no-referrer" width="420" height="180"></iframe>Academic citations (APA · BibTeX · CFF)
APA citation
CuriousLearner. (2026). conflict-resolver security audit report (audit version 8) [Author version unspecified]. Skillstore. https://skillstore.io/skills/curiouslearner-conflict-resolver/audits/8BibTeX citation
@techreport{curiouslearner-curiouslearner-conflict-resolver-2026,
author = {CuriousLearner},
title = {conflict-resolver security audit report (audit version 8)},
institution = {Skillstore},
year = {2026},
number = {8},
url = {https://skillstore.io/skills/curiouslearner-conflict-resolver/audits/8},
note = {Author version unspecified}
}CITATION.cff
cff-version: 1.2.0
message: "If you use this Skill, cite its author and this versioned security audit report."
title: "conflict-resolver security audit report (audit version 8)"
version: "unspecified"
type: report
authors:
- name: "CuriousLearner"
date-released: "2026-07-05"
url: "https://skillstore.io/skills/curiouslearner-conflict-resolver/audits/8"
identifiers:
- type: other
value: "skillstore:curiouslearner-conflict-resolver:audit:8"
description: "Skillstore immutable audit report identifier"
Skillstore Score
Why this score Evidence Confidence: Medium 55
Architecture
85
Maintainability
87
Content
71
Community
74
Spec Compliance
What You Can Build
Resolve feature branch conflicts
Compare both sides of a conflicted file and choose a combined resolution when both branches add useful behavior.
Review risky merge decisions
Check whether a proposed resolution discards behavior, hides validation, or needs follow-up tests before merge completion.
Teach Git conflict workflows
Explain conflict markers, common Git commands, and verification steps in a simple order for learners.
Try These Prompts
Explain a Conflict
Explain the conflict markers in this file and list the safest manual steps to resolve them.
Choose a Strategy
Compare both sides of this conflict and recommend ours, theirs, or a combined resolution with reasons.
Plan a Multi-File Merge
Analyze these related conflicts across files, identify shared intent, and propose an ordered resolution plan.
Validate a Resolution
Validate the proposed merge resolution for semantic regressions, missing tests, and follow-up checks before commit.
Best Practices
- Review the intent of both branches before choosing a side.
- Run read-only inspection commands before mutating the working tree.
- Confirm tests and code review after complex resolutions.
Avoid
- Do not accept all current or incoming changes without reading context.
- Do not run auto-resolution scripts on valuable work without a dry run.
- Do not ignore remaining conflict markers after staging files.
Frequently Asked Questions
Does this skill resolve conflicts automatically?
It provides strategies and example scripts, but users should review changes before any command modifies files.
Can it handle semantic conflicts?
It helps reason about intent and API changes, but project tests and human review remain necessary.
Which tools can use this skill?
The report lists support for Claude, Codex, and Claude Code.
Does it require network access?
No. The network-looking examples are application code snippets inside merge conflict examples.
Is it safe to run the included commands?
Some commands modify files, Git history, or global Git settings. Confirm each command before execution.
What should I do after resolving conflicts?
Check for remaining markers, run suitable tests, build affected areas, and request review for complex merges.
Developer Details
Author
CuriousLearnerLicense
MIT
Skillstore revision
r1
Version notice
The author did not declare a version.
Ref
02f077c174c5335e2f5d02ca15e77b70d9543e58
Maintenance freshness
7/20/2026
Usage
3 downloads · 274 views
File structure
📄 SKILL.md