# 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: `majiayu000/loom-docs-merge-conflicts` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds add majiayu000/loom-docs-merge-conflicts`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/loom-docs-merge-conflicts/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- License: MIT
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-09
- Page: https://skillmd.com/skills/majiayu000/loom-docs-merge-conflicts

---

<!-- 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._