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

ff_resolve_conflicts

Detects and resolves git merge or rebase conflicts interactively.

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 ff-resolve-conflicts-redblacktree
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: ff_resolve_conflicts
Source: https://github.com/redblacktree/fastflow/tree/main/internal/templates/files/.codex/skills/ff_resolve_conflicts
Command: npx skills add https://github.com/redblacktree/fastflow --skill ff-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, which is error-prone and time-consuming when multiple files are involved. ## Core Features & Use Cases - Conflict Detection: Automatically identifies conflicted files via git status and determines whether a merge or rebase is in progress. - Guided Resolution: Analyzes each conflict region, presents both sides of the change, and proposes a resolution plan before editing files. - Operation Completion: Stages resolved files and completes the merge commit or continues the rebase, with abort commands available as a fallback. - Use Case: After running git rebase main and hitting conflicts in three source files, invoke this Skill to review each conflict, choose resolutions, and finish the rebase without manually hunting for conflict markers. ## Quick Start Ask the assistant to resolve the current git merge conflicts in this repository and walk you through each conflicted file.

Frequently Asked Questions about ff_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?▼

List conflicted files with git diff --name-only --diff-filter=U, inspect each conflict region marked by <<<<<<<, =======, and >>>>>>>, choose a resolution, then stage files with git add and run git commit to finish the merge.

How to continue a rebase after fixing conflicts?▼

After editing conflicted files and staging them with git add, run git rebase --continue. The rebase may stop again if later commits also conflict, so repeat the resolve-and-continue cycle until it completes.

How can I tell if a merge or rebase is in progress?▼

Check for .git/MERGE_HEAD to detect a merge in progress, or .git/rebase-merge and .git/rebase-apply directories for a rebase. The git status --porcelain output also shows conflicted files marked UU, AA, or DD.

Can git merge conflicts in binary files be resolved automatically?▼

Binary files cannot be merged textually, so you must choose one version to keep. Use git checkout --ours or --theirs on the file, then stage it with git add before completing the merge or rebase.

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. Both restore the repository to its state before the operation started.

Related Skills

Explore More Software Engineering Skills→
mvillmowmvillmow
18

worktree-sync

Syncs Git worktrees by fetching remote and rebasing or merging main into feature branches.

Community
Basic
TioSavichTioSavich

ship

Merge base branch, run tests, bump version, update changelog, commit, push, and create a pull request.

Community
Advanced
meganidemeganide

merge

Merge origin/main into the current branch with guided conflict resolution.

Community
Basic
shonenmshonenm
2

conflict-resolve

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

Community
Advanced