pseudo-merge

Community

Convert edits into merge-conflict ready changes.

Authorchristopherkenny
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This skill automatically converts a copy-edit or proofreading report into an in-file git merge conflict version by inserting conflict blocks around each recommended edit, enabling you to accept or reject changes in place.

Core Features & Use Cases

  • In-place conflict generation: rewrites the original source file with git merge conflict markers for each suggested edit.
  • Section filtering: supports optional @sec-label to confine markers to a single Quarto section.
  • Clear provenance: documents the fake branch names original and claude-edits and reminds you how to recover previous states using git.

Quick Start

Provide the path to the edited report (e.g., reviews/my-edits.md) and let the skill apply conflict markers to the corresponding source file.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: pseudo-merge
Download link: https://github.com/christopherkenny/skills/archive/main.zip#pseudo-merge

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 510,000+ vetted skills library on demand.