What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent behind one side of the change or introducing regressions. This Skill provides a disciplined workflow for understanding each conflict, resolving every hunk correctly, and finishing the merge safely. ## Core Features & Use Cases - State Inspection: Examines the current merge/rebase state, git history, and conflicting files before touching anything. - Intent-Driven Resolution: Traces each conflict back to its primary sources (commit messages, PRs, original issues) so resolutions preserve both intents where possible, and never invents new behavior or aborts the merge. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format), fixes merge-induced breakage, then stages, commits, and continues the rebase to completion. - Use Case: You are mid-rebase of a feature branch onto main and hit conflicts in three files. The Skill walks through each hunk, checks the original PRs to understand both sides, resolves them, runs the test suite, and finishes the rebase. ## Quick Start Resolve the current git merge conflict in this repository, preserving the intent of both branches, then run the project checks and complete the merge.
