git-merge-resolving - Resolving Git merge and rebase conflicts
Resolves Git merge and rebase conflicts by analyzing commit intent, handling union conflicts, regenerating generated files, and attributing test failures.
Tags
Updated: 2026-09-21Capabilities
Typical Inputs
Typical Outputs
What this skill does
- Analyze commit intent from history
- Port additions into evolved lineage
- Combine union textual conflicts
- Regenerate generated files
- Attribute post-merge test failures
- Execute merges in scratch worktrees
Inputs
- Conflicting Git branches
- Git commit history
- Repository test suite
Outputs
- Resolved source files
- Merge commits
- Regenerated artifacts
Requirements
- Git CLI tool
- Repository write access