skills.rest
redblacktree
redblacktreeCOMMUNITY
Explore all skills by this author →
GitHub

source-command-resolve-conflicts

Resolves git merge and rebase conflicts through interactive analysis and staged file edits.

1|1|Updated Feb 3, 2026
Search Tags:#git#code review#version control#merge conflicts#rebase#conflict resolution
One-click install
npx skills add https://github.com/redblacktree/fastflow --skill source-command-resolve-conflicts-redblacktree
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: source-command-resolve-conflicts
Source: https://github.com/redblacktree/fastflow/tree/main/.agents/skills/source-command-resolve-conflicts
Command: npx skills add https://github.com/redblacktree/fastflow --skill source-command-resolve-conflicts-redblacktree

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Merge and rebase conflicts interrupt development workflows and require careful manual inspection of conflict markers, branch states, and competing changes. This Skill guides an AI agent through detecting conflicts, analyzing each conflicted region, proposing resolutions, and completing the merge or rebase operation safely. ## Core Features & Use Cases - Conflict Detection: Identifies merge or rebase state via git status, MERGE_HEAD, and rebase directories, then lists all conflicted files. - Guided Resolution: Analyzes conflict markers (<<<<<<<, =======, >>>>>>>), explains both sides of each conflict, and presents a resolution plan before editing. - Operation Completion: Stages resolved files and finishes the workflow with git commit for merges or git rebase --continue for rebases, with abort options available. - Use Case: After running git merge feature-branch and hitting conflicts in three source files, invoke this Skill to review each conflict, choose resolutions, and complete the merge commit. ## Quick Start Ask the agent to resolve the git merge conflicts in the current branch and walk you through each conflicted file before committing.

Frequently Asked Questions about source-command-resolve-conflicts

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

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

First detect conflicts with git status, then list conflicted files using git diff --name-only --diff-filter=U. Analyze each conflict region marked by <<<<<<<, =======, and >>>>>>>, choose a resolution, edit the file, stage it with git add, and finish with git commit.

How to tell if a git conflict is from a merge or rebase?▼

Check for .git/MERGE_HEAD to confirm a merge in progress, or look for .git/rebase-merge/ and .git/rebase-apply/ directories to confirm a rebase. The resolution completion step differs: merges finish with git commit, rebases with git rebase --continue.

Can git conflicts in binary files be merged automatically?▼

No, binary files cannot be merged line-by-line because they lack textual conflict markers. You must manually choose which version to keep, either ours or theirs, then stage the chosen file with git add.

How do I abort a merge or rebase if resolution goes wrong?▼

Run git merge --abort to cancel an in-progress merge, or git rebase --abort to cancel a rebase and return the branch to its original state. This discards any partial conflict resolutions made so far.

Why does git rebase --continue show more conflicts after resolving?▼

A rebase replays commits one at a time, so each subsequent commit may introduce new conflicts against the updated base. Resolve each round, stage the files, and run git rebase --continue again until the rebase completes.

Related Skills

Explore More Software Engineering Skills→
robertolopezlopezrobertolopezlopez
1

git-rebase-conflict-resolver

Resolve Git rebase conflicts while preserving compatible changes and running validation checks.

Community
Advanced
pinoshepinoshe

github

Automate GitHub pull request workflows from branch creation to PR opening.

Community
Advanced
Fatih0234Fatih0234

resolving-merge-conflicts

Resolves in-progress git merge and rebase conflicts by analyzing commit history and intent.

Community
Intermediate
shonenmshonenm
2

conflict-resolve

Resolve Git merge and rebase conflicts by analyzing base, ours, and theirs states.

Community
Advanced