skills.rest
drdanmaggs
drdanmaggsCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolve-conflict

Resolve PR merge conflicts by fetching, rebasing, resolving, verifying, and polling CI.

Updated Mar 19, 2026
Search Tags:#automation#git#rebase#pull-request#merge-conflicts#sequential-thinking#ci-polling
One-click install
npx skills add https://github.com/drdanmaggs/rocket-fuel --skill resolve-conflict-drdanmaggs
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflict
Source: https://github.com/drdanmaggs/rocket-fuel/tree/main/internal/plugin/skills/resolve-conflict
Command: npx skills add https://github.com/drdanmaggs/rocket-fuel --skill resolve-conflict-drdanmaggs

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolves merge conflicts on the current PR branch automatically using sequential thinking, minimizing manual intervention and only pausing when a conflict is genuinely ambiguous.

Core Features & Use Cases

  • Sequential conflict analysis and automatic resolution for non-ambiguous hunks.
  • Local verification, automated pushing, and CI polling until all checks pass.
  • Ready-to-merge notification with a summary of actions taken.

Quick Start

Simply instruct the tool to resolve the PR conflicts and it will fetch, rebase onto main, resolve conflicts, verify, push, and poll CI until ready to merge.

Frequently Asked Questions about resolve-conflict

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

FAQPage Schema
How do I automatically resolve merge conflicts on a pull request branch?▼

Merge conflicts on a PR branch are resolved automatically using sequential thinking to fetch, rebase onto main, resolve non-ambiguous hunks, verify locally, and push. User input is only requested for genuinely ambiguous conflicts during the resolution workflow.

What's the best way to handle git rebase conflicts without manual intervention?▼

Git rebase conflicts are handled without manual intervention by applying sequential analysis to automatically resolve non-ambiguous hunks. The workflow then verifies the result locally, pushes the branch, and polls CI checks until they pass and the branch is ready to merge.

Does this PR conflict resolution tool poll CI checks until they pass?▼

Yes, PR conflict resolution includes automated CI polling that continuously checks status after pushing the rebased branch. It polls until all checks pass and then announces readiness to merge with a summary of actions taken.

When do I need to provide input during automated merge conflict resolution?▼

Input is only needed during automated merge conflict resolution when a conflict is genuinely ambiguous. Non-ambiguous conflict hunks are resolved automatically through sequential thinking without pausing for user intervention.

Can I use sequential thinking to resolve conflicts across multiple branches in one workflow?▼

Sequential thinking resolves conflicts on the current PR branch after merging another branch triggers issues. The workflow fetches, rebases onto main, resolves conflicts sequentially, verifies locally, pushes, and polls CI until ready.

Why does the rebase stop during PR conflict resolution and ask for my input?▼

The rebase stops and asks for input only when a merge conflict is genuinely ambiguous and cannot be resolved automatically. All non-ambiguous hunks are resolved without pausing the sequential thinking workflow.

Related Skills

Explore More Software Engineering Skills→
gewoonsebagewoonseba
9

rebase-main

Rebase the current branch onto origin/main after conflict resolution.

Community
Advanced
fredericpoitevinfredericpoitevin

babysit

Triage PR comments, resolve conflicts, and stabilize CI until merge-ready.

Community
Intermediate
zach-sourcezach-source

ci-polling

Monitor GitHub Actions and GitLab CI/CD pipeline statuses with background polling tasks.

Community
Intermediate
MilesChouMilesChou
1

Resolving-Conflict

Resolve Git conflicts during rebase or merge operations.

Community
Basic