pseudo-merge

Convert copy-edit reports into in-file git merge conflict blocks.

14|2|Updated Feb 26, 2026
One-click install
npx skills add https://github.com/christopherkenny/skills --skill pseudo-merge
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: pseudo-merge
Source: https://github.com/christopherkenny/skills/tree/main/skills/pseudo-merge
Command: npx skills add https://github.com/christopherkenny/skills --skill pseudo-merge

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about pseudo-merge

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I convert a proofreading report into git merge conflicts in a markdown file?

Merge conflict markers can be automatically inserted into your source markdown file by parsing Original/Recommended edit pairs from a copy-edit report. The skill wraps each suggested change with conflict blocks, letting you accept or reject edits in place.

What is the best way to apply copy-edit suggestions directly to a source file for in-place review?

Applying copy-edit suggestions directly uses git merge conflict markers to delineate each recommended edit within the original source file. This approach rewrites the file with conflict blocks, enabling you to resolve changes without leaving your editor.

Can I limit merge conflict generation to a specific Quarto section using a section label?

Yes, you can scope conflict marker insertion to a single Quarto section by providing an optional @sec-label. This confines the generated merge conflict blocks to only the edits within that specified section label.

Does this merge conflict approach require the original source file path to work?

Yes, the process requires the original source file path to insert conflict markers, or it can derive the path from the report filename. Without the source file, the skill cannot map recommended edits to the original text.

Why use fake git merge conflict markers instead of track changes for reviewing copy-edits?

Fake git merge conflict markers let you review copy-edits directly in any text editor without proprietary track-change formatting. You can accept or reject changes using standard git workflows, and previous states remain recoverable via git.

What format does the copy-edit report need to be in for automatic merge conflict generation?

The report needs to be a markdown file containing Original/Recommended edit pairs, such as a proofreading or APSA-style report. The skill parses these pairs and inserts conflict markers around each recommended edit in the source file.