Skip to content
loom-docs-merge-conflicts logo

Loom Docs Merge Conflicts

loom-docs-merge-conflicts

Resolve git merge conflicts in compound-managed LOOM docs (LOOM_CHANGELOG.md, LOOM_ROADMAP.md) without breaking BEGIN/END fences.

SKILL.md

Full skill instructions

<!-- BEGIN:compound:skill-managed -->

Purpose

Resolve merge conflicts in compound-managed LOOM docs without breaking compound fences.

When To Use

  • You see <<<<<<<, =======, or >>>>>>> in LOOM_CHANGELOG.md or LOOM_ROADMAP.md.
  • A merge/​rebase touched compound-managed blocks and left conflicts.

Procedure

  • Open the conflicted file and locate every conflict hunk.
  • Preserve the compound fences exactly:
    • Keep <!-- BEGIN:compound:... --> and <!-- END:compound:... --> lines unchanged.
    • Do not duplicate or reorder fence lines.
  • For conflicted list entries inside fences:
    • Prefer keeping both sides' entries, then dedupe exact duplicates.
    • Maintain consistent bullet formatting: - <timestamp> <note>.
    • Keep ordering stable (typically newest-first if the file already uses that pattern).
  • Remove all conflict marker lines (<<<<<<<, =======, >>>>>>>) after selecting the final content.
  • Sanity check:
    • No conflict markers remain.
    • Markdown renders as a single list (no nested accidental - - unless the file intentionally uses it).
    • The file contains exactly one BEGIN and one END for each compound block.
  • Run docs sync to refresh derived indexes/​managed blocks (so downstream agents don’t learn from broken docs).
<!-- END:compound:skill-managed -->

Manual notes

This section is preserved when the skill is updated. Put human notes, caveats, and exceptions here.

More Other skills

Delegate independent tasks to specialized agents working concurrently with isolated context.

295.4K 206.3K
View

Applies Anthropic's official brand colors and typography to any sort of artifact that may benefit from having Anthropic's look-and-feel. Use it when brand colors or style guidelines, visual formatting, or company design standards apply.

179.7K 100.1K
View

Toolkit for styling artifacts with a theme. These artifacts can be slides, docs, reportings, HTML landing pages, etc. There are 10 pre-set themes with colors/fonts that you can apply to any artifact that has been creating, or can generate a new theme on-the-fly.

179.7K 89.5K
View

A set of resources to help me write all kinds of internal communications, using the formats that my company likes to use. Claude should use this skill whenever asked to write some sort of internal communications (status reports, leadership updates, 3P updates, company newsletters, FAQs, incident reports, project updates, etc.).

179.7K 76.1K
View

Fundamental design principles for writing maintainable, testable Python code.

40.2K 21.9K
View

Modern responsive layouts using container queries, fluid typography, CSS Grid, and mobile-first strategies.

40.2K 20K
View

Generate Playwright tests from scenarios using interactive browser exploration and validation.

39.7K 18.2K
View

Modern React state management with Redux Toolkit, Zustand, Jotai, and React Query for every state category.

40.2K 14.7K
View

GDPR-compliant data handling with consent management, data subject rights, and privacy controls.

40.2K 14.3K
View

Python error handling patterns including input validation, exception hierarchies, and partial failure handling. Use when implementing validation logic, designing exception strategies, handling batch processing failures, or building robust APIs.

40.2K 13.5K
View

Detailed multi-file refactor planning with safety checks and rollback guidance.

39.7K 13K
View