skills.rest
cloudofgeorge
cloudofgeorgeCOMMUNITY
Explore all skills by this author →
Website𝕏@cloudofgeorgeGitHub

resolving-merge-conflicts

Resolves in-progress git merge and rebase conflicts while preserving both change intents.

Updated May 11, 2026
Search Tags:#git#code review#version control#branching#merge conflicts#rebase#conflict resolution
One-click install
npx skills add https://github.com/cloudofgeorge/AI-hands-Engineer --skill resolving-merge-conflicts-cloudofgeorge
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolving-merge-conflicts
Source: https://github.com/cloudofgeorge/AI-hands-Engineer/tree/main/skills/engineering/resolving-merge-conflicts
Command: npx skills add https://github.com/cloudofgeorge/AI-hands-Engineer --skill resolving-merge-conflicts-cloudofgeorge

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merge and rebase conflicts interrupt git workflows and are often resolved hastily, losing one side's intent or introducing broken code. This Skill provides a disciplined procedure for understanding each conflict's origin and resolving it correctly. ## Core Features & Use Cases - Conflict Investigation: Inspects git history, commit messages, PRs, and original issues to understand why each conflicting change was made. - Intent-Preserving Resolution: Resolves each hunk by preserving both intents where possible, never aborting the merge and never inventing new behavior. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format) after resolution, then stages, commits, and continues the rebase to completion. - Use Case: During a long-running feature branch rebase onto main, conflicts appear across five files. Use this Skill to trace each conflict back to its originating PR, resolve hunks according to the merge's stated goal, and finish the rebase with all checks passing. ## Quick Start Resolve the current in-progress git merge conflict by investigating each conflicting change's origin, resolving every hunk, running the project checks, and completing the merge.

Frequently Asked Questions about resolving-merge-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve a git merge conflict step by step?▼

First inspect the current merge state and conflicting files, then trace each change's origin through commit messages, PRs, and issues. Resolve each hunk preserving both intents where possible, run the project's typecheck, tests, and format checks, then stage everything and commit.

How to continue a git rebase after fixing conflicts?▼

After resolving each conflicted hunk and staging the files, continue the rebase process until all commits are rebased. Run the project's automated checks before continuing to catch anything the merge broke.

Should I use git merge or git rebase when conflicts happen?▼

The resolution approach is the same for both: understand each change's intent, resolve hunks without inventing new behavior, and verify with automated checks. For merges you commit the resolution; for rebases you continue until all commits are replayed.

When should I abort a merge instead of resolving conflicts?▼

This workflow never aborts: always resolve conflicts rather than running git merge --abort or git rebase --abort. Where two intents are incompatible, pick the one matching the merge's stated goal and note the trade-off.

Why do merge conflicts keep breaking tests after resolution?▼

Conflicts resolved without understanding both changes' intent often combine incompatible logic. After resolving, always run the project's automated checks in order—typecheck, then tests, then format—and fix anything the merge broke before committing.

Related Skills

Explore More Software Engineering Skills→
mathiasbourgoinmathiasbourgoin
2

git-conventions

Standardize git commit messages, branch names, and pull request descriptions.

Community
Intermediate
greencmgreencm
1

land-and-deploy

Merge pull requests, run CI tests, and deploy to production with canary checks.

Community
Advanced
redblacktreeredblacktree
1

ff_resolve_conflicts

Detects and resolves git merge or rebase conflicts interactively.

Community
Intermediate
sddevelopment-besddevelopment-be
13

Approach: Trunk-Based Development for Agent-First Workflows

Enforce trunk-based development workflows on the main branch for agent-first collaboration.

Official
Intermediate