Resolve Git Merge and Rebase Conflicts

A 5-step process for resolving an in-progress git merge or rebase conflict. Step 1 surveys the current state - checking git history and the conflicting files directly. Step 2 finds the primary source for each conflict, understanding deeply why each change was made and what the original intent was by reading commit messages, checking PRs, and checking the original issues or tickets behind each side. Step 3 resolves each conflicting hunk, preserving both intents where possible; where they're genuinely incompatible, it picks whichever matches the merge's stated goal and explicitly notes the trade-off - it never invents new behavior to paper over a conflict, and it always resolves rather than running --abort. Step 4 discovers and runs the project's own automated checks - typically typecheck, then tests, then format - fixing anything the merge broke before finishing. Step 5 finishes the merge or rebase: staging everything and committing, or if rebasing, continuing the rebase process until every commit has been rebased through.

Use it when there's an in-progress git merge or rebase conflict that needs resolving.

Input is a repository mid-merge or mid-rebase with conflicting files. Output is a completed merge or rebase - every hunk resolved based on each side's actual intent, the project's own checks passing, and the result committed (or the rebase carried through to completion).

Uses standard git commands (history inspection, conflict resolution, staging, commit, rebase continuation) plus whatever automated checks the project defines (typecheck, test, format commands).

Developers stuck in an active merge or rebase conflict who want each hunk resolved based on the original intent behind both sides rather than a mechanical pick, with the project's own checks verified before finishing.