What problem does it solve? Merge conflicts in CHANGELOG.md are common when branches append entries near the same lines, and resolving them by picking one side wholesale loses entries or breaks the file's documented format. This Skill detects the repo's actual changelog convention and folds the other side's new entries into it correctly. ## Core Features & Use Cases - Convention Detection: Reads the file header, recent git history, and repo rule files (CLAUDE.md, CONTRIBUTING.md) to identify whether the changelog uses Keep a Changelog per-version sections, monthly sections, or a single [Unreleased] bucket. - Operation-Aware Resolution: Handles conflicts from merges, rebases, and cherry-picks by resolving MERGE_HEAD, REBASE_HEAD, or CHERRY_PICK_HEAD placeholders and continuing the correct operation afterward. - Mechanical Verification: Runs a Python ordering check on dated entries and greps for all three conflict markers to confirm no debris remains before committing. - Use Case: During a rebase, git reports a conflict in CHANGELOG.md because the incoming commit still uses an older monthly format. The Skill detects the current per-version convention, converts the new entries to match, verifies ordering, and runs git rebase --continue. ## Quick Start Resolve the current merge conflict in CHANGELOG.md by detecting the file's existing format and folding the incoming entries into it.
