Fix merge conflicts
SkillCommerce & financeResolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Available today. Use it from your connected AI after setup.
No other account needed.
Connect ahel once, and every AI you use reads what you have installed.
Then ask your AI: use the Fix merge conflicts skill
What this skill tells your AI
The instructions your AI receives, as published by barbieri/local-openfinance in .agents/skills/fix-merge-conflicts/SKILL.md and read by ahel’s review.
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- Stage resolved files and summarize key decisions.
Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
Output
- Files resolved
- Notable resolution choices
- Build/test outcome
Signals
- GitHub stars
- 22
- Forks
- 2
- Last commit
- Sep 2026
ahel recommends instead
Advanced
- Catalog kind
- skill
- Gateway key
fix-merge-conflicts-barbieri- Source
- github.com/barbieri/local-openfinance