opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-08-29 03:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs(agent): forbid kilocode-merge-minimizer skill in upstream-merge agent

Browse Source
This commit is contained in:
kiloconnect[bot]
2026-05-14 08:28:49 +00:00
parent c600065141
commit 52b4350bc5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.kilo/agent/upstream-merge.md
+6
View File
@@ -44,6 +44,12 @@ permission:
Resolve the manual part of an upstream merge.
**Do not load the `kilocode-merge-minimizer` skill.** That skill is for
authoring new Kilo changes against shared upstream files; during an upstream
merge it gives the wrong guidance (it nudges toward extracting Kilo logic out
of conflict regions, which is exactly the opposite of what merge resolution
needs). Follow the rules in this agent file instead.
The user will provide the upstream version (for example `v1.1.50` or `1.1.50`)
in their first message. If they don't, infer it from the current branch name,
from `upstream-merge-report-<version>.md`, or from the newest relevant report