2d-games
Free2D game development principles. Sprites, tilemaps, physics, camera.
The English summary is being prepared. Showing the original description.
VoDaiLocz/kilo-kit-mcp28Updated Sep 13, 2026
FreePublished on GitHub
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
See how to installFiles included (1)
- SKILL.md918 B
SKILL.md (original)
Review the instructions the agent will receive before you install.
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Reviews
No reviews yet. Tell others what you thought.
Comments
No login needed. Share how it worked for you, ask a question, or note where it did not run.
No comments yet. Be the first to write one.
More skills from this repository
3d-games
Free3D game development principles. Rendering, shaders, physics, cameras.
The English summary is being prepared. Showing the original description.
VoDaiLocz/kilo-kit-mcp28Updated Sep 13, 2026
aesthetic
FreeCreate aesthetically beautiful interfaces following proven design principles. Use when building UI/UX, analyzing designs from inspiration sites, generating design images with ai-multimodal, implementing visual hierarchy and color theory, adding micro-interactions, or creating design documentation. Includes workflows for capturing and analyzing inspiration screenshots with chrome-devtools and ai-multimodal, iterative design image generation until aesthetic standards are met, and comprehensive design system guidance covering BEAUTIFUL (aesthetic principles), RIGHT (functionality/accessibility), SATISFYING (micro-interactions), and PEAK (storytelling) stages. Integrates with chrome-devtools, ai-multimodal, media-processing, ui-styling, and web-frameworks skills.
The English summary is being prepared. Showing the original description.
VoDaiLocz/kilo-kit-mcp28Updated Sep 13, 2026
agent-memory
FreeUse when implementing or managing persistent, hierarchical memory systems for AI agents. Covers cross-session state, fact supersession, and self-managed memory tools to enable long-term recall and adaptive agent behavior.
The English summary is being prepared. Showing the original description.
VoDaiLocz/kilo-kit-mcp28Updated Sep 13, 2026
Use when monitoring, tracing, or debugging agentic workflows in production. Keywords: observability, tracing, OpenTelemetry, Langfuse, latency, token cost, loop detection, telemetry.
The English summary is being prepared. Showing the original description.
VoDaiLocz/kilo-kit-mcp28Updated Sep 13, 2026
agentic-rag
FreeUse when building self-correcting retrieval systems for AI agents. Keywords: RAG, retrieval, Corrective RAG, Self-RAG, query decomposition, reranking, hallucination, grounding.
The English summary is being prepared. Showing the original description.
VoDaiLocz/kilo-kit-mcp28Updated Sep 13, 2026