skills.rest
lucasilverentand
lucasilverentandCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolving-pr-conflicts

Analyze Git branch changes to produce deterministic PR conflict resolution plans.

3|Updated Jan 23, 2026
Search Tags:#git#workflow#conflict-resolution#resolve#pull-requests#merge-conflicts#rebasing
One-click install
npx skills add https://github.com/lucasilverentand/skills --skill resolving-pr-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolving-pr-conflicts
Source: https://github.com/lucasilverentand/skills/tree/main/skills/pull-requests/resolving-pr-conflicts
Command: npx skills add https://github.com/lucasilverentand/skills --skill resolving-pr-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill guides developers through resolving pull request conflicts by analyzing competing changes and clarifying intent to minimize manual guesswork and rework.

Core Features & Use Cases

  • Context-aware conflict analysis across branches to identify root causes.
  • Step-by-step resolution strategies for each conflicting file (keep ours, keep theirs, or combine).
  • Deterministic workflow guidance including validation checks and PR update steps.
  • Use Case: When a PR touches the same files as another branch, the Skill provides a plan to merge changes safely.

Quick Start

Run the PR conflict-resolution workflow on a repository with active conflicts by specifying the current branch and target PR; the AI will guide through identification, strategy selection, resolution, and validation.

Frequently Asked Questions about resolving-pr-conflicts

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

FAQPage Schema
How do I resolve merge conflicts in a pull request safely?▼

To resolve merge conflicts safely, this skill analyzes competing branch changes and intent to generate a step-by-step resolution plan. It identifies root causes, recommends keeping ours or theirs, and enforces validation checks for safe finalization.

What is the best way to handle git rebase conflicts across collaborative workflows?▼

Handling git rebase conflicts requires deterministic workflow guidance to minimize manual guesswork. This skill provides structured strategies for rebasing and PR updates, including validation steps to ensure changes merge safely without rework.

How do I identify the root cause of a git conflict when multiple branches change the same file?▼

Identifying the root cause of a git conflict involves context-aware analysis across branches. This skill examines competing changes to clarify intent and produce a deterministic resolution plan, specifying whether to keep ours, theirs, or combine.

Does this conflict resolution workflow support both merging and rebasing strategies?▼

Yes, this conflict resolution workflow supports both merging and rebasing strategies. It provides deterministic guidance for PR updates across collaborative workflows, enforcing safe finalization through validation steps regardless of the chosen Git strategy.

What steps should I follow to finalize a PR update after resolving branch conflicts?▼

To finalize a PR update after resolving branch conflicts, follow the deterministic workflow guidance. The skill enforces validation steps and recommended resolution strategies to ensure safe finalization, minimizing manual guesswork and rework.

Related Skills

Explore More Software Engineering Skills→
cheaficheafi

roo-conflict-resolution

Resolve merge and rebase conflicts using PR context and commit intent.

Community
Intermediate
jkomorosjkomoros
9

land-branch

Rebase a feature branch onto main and merge via pull request.

Community
Intermediate
SeleznovIvanSeleznovIvan
1

git-workflow

Manage Git merges, rebases, and commit history across branches.

Community
Intermediate
OmniNode-aiOmniNode-ai
3

create-ticket

Create and manage Linear tickets from titles, YAML contracts, or plan milestones.

Official
Advanced