History

Description

## [2026-08-18] Install reconcile: upstream always wins Areas: install.sh, runtime-kotlin/runtime-cli (update command) - Reconcile no longer preserves local edits. `install.sh` lost `--prefer-upstream`, `PREFER_UPSTREAM`, the y/n conflict prompt, the no-TTY conflict abort, the `SKILL_BILL_RECONCILE_CONFLICT_CHOICE` test seam, `--accept-conflicts`, `RECONCILE_CONFLICT_PATHS` and the summary block that reported overwritten conflicts. `skill-bill update` lost its `--prefer-upstream` passthrough. -

Installation

Installs to ~/.claude/agents/sermilion-skill-bill-history.md

Restart Claude Code, or start a new session, for it to be picked up.