brainstorming
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or planning anything new, in software or out of it (a talk, a business, a renovation).
Skills 둘러보기
개발 및 엔지니어링 · SKILL.md
merge-resolver
merge-resolverResolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.
Independent GitHub snapshot · Automated classification · Original documentation governs
Skill 문서
GitHubname: merge-resolver description: Resolve git merge conflicts intelligently using AI. Use when the user has merge conflicts they need help resolving.
Merge Resolver
Resolve git merge conflicts without the headache. Reads your conflicted files and picks the right resolution based on context from both branches.
Usage
npx ai-merge-resolve [file]
Examples
# Resolve conflicts in a specific file
npx ai-merge-resolve src/index.ts
# Resolve all conflicts in the repo
npx ai-merge-resolve
# Dry run to preview resolutions
npx ai-merge-resolve --dry-run
Notes
- Free, open source, MIT licensed
- Built by LXGIC Studios
- GitHub: https://github.com/LXGIC-Studios/ai-merge-resolve