fix-merge-conflicts
Resolve git merge conflicts in dependency files, source code, and configuration. Use when merge conflicts are detected.
Full skill instructions
You are the AI Engineering Maintenance Bot resolving merge conflicts in a Vector Institute repository.
Read .pr-context.json for PR details. Check git status for conflicting files.
NEVER commit these temporary bot files:
.claude/ directory (bot skills).pr-context.json (bot metadata).failure-logs.txt (bot logs)These files are automatically excluded from git, but do not explicitly git add them.
When committing fixes, only add the actual fix files:
# ✅ CORRECT: Add only fix-related files
git add src/conflicted-file.ts package.json
# ❌ WRONG: Never do this
git add . # This might include bot files if exclusion fails
git add .claude/
git add .pr-context.json
git status
git diff --name-only --diff-filter=U
Dependency Files (package.json, requirements.txt)
Example:
<<<<<<< HEAD
"dep-a": "^2.0.0",
"dep-b": "^1.5.0"
=======
"dep-a": "^1.9.0",
"dep-c": "^3.0.0"
>>>>>>> PR
RESOLVE TO:
"dep-a": "^2.0.0", // Newer version
"dep-b": "^1.5.0", // From base
"dep-c": "^3.0.0" // From PR
Lock Files (package-lock.json, poetry.lock)
npm install # npm
poetry lock # Python
cargo update # Rust
Source Code
Configuration Files
Documentation
For each file:
<<<<<<<, =======, >>>>>>>)git add <resolved-files>
git diff --check # Verify no markers remain
CRITICAL: Push changes to the correct PR branch!
# Get branch name from .pr-context.json
HEAD_REF=$(jq -r '.head_ref' .pr-context.json)
# Push to the PR branch (NOT a new branch!)
git push origin HEAD:refs/heads/$HEAD_REF
DO NOT:
git push origin HEAD without specifying targetThe branch name MUST match head_ref from .pr-context.json.
Resolve merge conflicts
- [File 1]: [Resolution description]
- [File 2]: [Resolution description]
Co-authored-by: AI Engineering Maintenance Bot <[email protected]>
Comprehensive Spring Framework and Spring Boot best practices including dependency injection patterns, bean lifecycle and scopes, REST API development, Spring Data JPA, service layer design, Spring Security, testing strategies, caching, AOP, async processing, error handling, and common anti-patte...
Dispatch to the right problem-solving technique based on how you're stuck
TypeScript厳格モードによる型安全性設計を専門とするスキル。 📖 参照書籍: - 『Effective TypeScript』（Dan Vanderkam）: 型設計 📚 リソース参照: - `resources/Level1_basics.md`: レベル1の基礎ガイド - `resources/Level2_intermediate.md`: レベル2の実務ガイド - `resources/Level3_advanced.md`: レベル3の応用ガイド - `resources/Level4_expert.md`: レベル4の専門ガイド - `resources/di...
Deploys applications to cloud Kubernetes (AKS/GKE/DOKS) with CI/CD pipelines. Use when deploying to production, setting up GitHub Actions, troubleshooting deployments. Covers build-time vs runtime vars, architecture matching, and battle-tested debugging.
19-agent team structure, decision trees for agent selection, Haiku vs Sonnet model selection, and agent collaboration principles. Use when deciding which sub-agent to invoke, understanding team responsibilities, or learning multi-agent orchestration.
Converts architecture descriptions, module specs, or workflow docs into Mermaid diagrams. Use when visualizing brick module relationships, workflows (DDD, investigation), or system architecture. Supports: flowcharts, sequence diagrams, class diagrams, state machines, entity relationship diagrams,...
INVOKE FIRST before any code work. Validates git workflow (branch, issue, worklog) and checks approach. Use at START of every task and END before completing. Prevents skipped steps.
This skill should be used when working with browser-rendered artifacts (i.e. Bun, React/React Native) to proactively validate that development work on localhost is being built appropriately and to support debugging browser-rendered content. Use this skill after making frontend changes to verify t...
Lead Développeur - Coordination technique opérationnelle, code review, mentoring et livraison. Pair de web-dev-process au niveau OPÉRATIONS.
Monitor Docker workers, RQ queue health, and auto-scale workers (max 4). Use when: checking job progress, monitoring queue depth, scaling workers up/down, diagnosing slow processing, or waiting for jobs to complete. Referenced by data-quality skill during reprocessing.
Proactive quality guidance system that monitors artifact creation and provides real-time feedback on documentation quality
This skill should be used when the user wants to bump the version number in the workspace. It updates versions across all pyproject.toml files (root, tde, and tda packages) and the CHANGELOG.md to keep them synchronized.
Generate, edit, and beat-sync AI video with leading models in one workspace.
The world's fastest calendar for remote work
Transform Your Design with AI Designer by ImgCreator.ai
Revolutionizing Video Production with AI-Powered Creativity
Extend an image past the frame and let AI fill the new aspect ratio.
Discover your celebrity doppelgänger with StarByFace!
ChainClarity explains 700+ crypto whitepapers in plain English, with layered summaries, comparisons, research tools, alerts, and a $4.99 Pro plan.
Opus.ai: Revolutionize Your Web Experience