agentsclimarketplace

Git merge conflict resolution

Skill planifest/planifest-framework/planifest-framework/external-skills/git-merge-conflict-resolution

A specification framework for agentic development. Agents build from complete specs - not guesses.

Install
npx -y skills add planifest/planifest-framework --skill git-merge-conflict-resolution

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

One thing to look at

  • 0 stars0 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Resolve Git merge/rebase conflicts with explicit intent tracking and post-resolution verification. Use when conflicts occur and intent-preserving resolution is required before integration; do not use for CI workflow design or application behavior implementation.

SKILL.md

2.0 KB, 342 tokens by cl100k_base, as published. Nobody here has run it

Git Merge Conflict Resolution

Overview

Use this skill to resolve conflicts without silently dropping behavior from either side.

Scope Boundaries

  • Use this skill when the task matches the trigger condition described in description.
  • Do not use this skill when the primary task falls outside this skill's domain.

Shared References

  • Semantic conflict triage:
    • references/semantic-conflict-triage.md

Templates And Assets

  • Resolution log template:
    • assets/conflict-resolution-log-template.md
  • Verification checklist:
    • assets/conflict-verification-checklist.md

Inputs To Gather

  • Conflicted files and conflict types.
  • Intent of each conflicting change set.
  • Required tests and high-risk behavioral paths.
  • Domain-owner contacts for ambiguous semantic conflicts.

Deliverables

  • Conflict resolution decisions with rationale.
  • File-level intent mapping for resolved hunks.
  • Verification evidence for resolved behavior.

Workflow

  1. Classify conflicts by behavioral impact and risk.
  2. Resolve textual conflicts while preserving intent from both sides.
  3. Log rationale in assets/conflict-resolution-log-template.md.
  4. Validate with assets/conflict-verification-checklist.md.
  5. Escalate unresolved semantic ambiguity using references/semantic-conflict-triage.md.

Quality Standard

  • Every resolved hunk has explicit intent rationale.
  • No conflict markers remain.
  • Affected behaviors are re-verified by tests/manual checks.
  • High-risk semantic merges receive domain-owner review.

Failure Conditions

  • Stop when change intent cannot be reconstructed confidently.
  • Stop when semantic correctness cannot be verified post-resolution.
  • Escalate when domain arbitration is needed for ambiguous merges.

What ships with it: 1 file

11.3 KB alongside SKILL.md

Keep looking

Skills are one crate of 328,083. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.