aidentity / index

mattpocock/skills · MIT

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

stable

Contents

  1. See the current state of the merge/rebase. Check git history, and the conflicting files.
  1. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
  1. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.
  1. Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
  1. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Provenance

Authored by Matt Pocock in mattpocock/skills. The content is mirrored here under its upstream license.

Related

git-workflow-and-versioning Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, opening or reviewing a pull request (PR), pushing to a remote, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog. addyosmani/agent-skills MIT git-guardrails-claude-code Set up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute. Use when user wants to prevent destructive git operations, add git safety hooks, or block git push/reset in Claude Code. mattpocock/skills MIT setup-pre-commit Set up Husky pre-commit hooks with lint-staged (Prettier), type checking, and tests in the current repo. Use when user wants to add pre-commit hooks, set up Husky, configure lint-staged, or add commit-time formatting/typechecking/testing. mattpocock/skills MIT finishing-a-development-branch Use when implementation is complete, all tests pass, and you need to decide how to integrate the work obra/superpowers MIT using-git-worktrees Use when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback obra/superpowers MIT