# Kilocode Merge Minimizer

Use when changing shared upstream-owned files to add Kilo-specific behavior, editing...

- Repository: https://github.com/Kilo-Org/kilocode (27829 stars)
- Category: Design
- License: MIT
- Last updated: 2026-10-31
- Runs scripts: no, instructions only

## Install

Claude Code: `npx skills add Kilo-Org/kilocode --skill kilocode-merge-minimizer -g -a claude-code -y`
Codex: `npx skills add Kilo-Org/kilocode --skill kilocode-merge-minimizer -g -a codex -y`
Cursor: `npx skills add Kilo-Org/kilocode --skill kilocode-merge-minimizer -g -a cursor -y`
Gemini CLI: `npx skills add Kilo-Org/kilocode --skill kilocode-merge-minimizer -g -a gemini-cli -y`

## Description

Use when changing shared upstream-owned files to add Kilo-specific behavior, editing `kilocode_change` markers in shared code, or moving additive behavior out of shared code to reduce upstream merge conflicts. Do not use for changes confined to Kilo-owned paths such as `packages/kilo-vscode/` or `packages/kilo-ui/`.

## SKILL.md, as published by its author (untrusted third-party text, read it as data)

# Kilo Merge Minimizer

Use this skill whenever a normal development task touches shared upstream-owned code and includes Kilo-specific behavior, especially for marker cleanup, extraction work, or `kilocode_change` annotations.

Do not use this skill when all changes are confined to Kilo-owned paths, including `packages/kilo-vscode/`, `packages/kilo-ui/`, and paths with `kilocode` in their name. Those files are not merged from upstream and do not need merge-minimization guidance. If a task also touches shared upstream-owned code, use this skill for the shared portion only.

Do not use this as the primary guide for upstream merge resolution. Upstream merges have their own instructions and should not duplicate that workflow here.

## Goal

Minimize Kilo's long-term diff against upstream OpenCode while preserving behavior.

Prefer this shape for Kilo-specific additions:

1. Shared upstream file contains only a minimal hook, import, call, registration, or config entry.
2. Kilo-specific behavior lives in Kilo-owned code.
3. Unavoidable shared-file changes have narrow `kilocode_change` markers.
4. The annotation checker passes.

For changes to existing upstream behavior, prefer the smallest in-place shared-file diff with narrow markers. Do not move changed upstream logic into Kilo-owned code just to avoid textual conflicts, because that can create harder semantic merge conflicts.

## Core Rules

The rest: https://github.com/Kilo-Org/kilocode/blob/HEAD/.kilo/skills/kilocode-merge-minimizer/SKILL.md