skills.rest
ousiass
ousiassCOMMUNITY
Explore all skills by this author →
GitHub

resolve-conflicts-en

Resolve GitHub pull request merge conflicts using an isolated Git worktree.

Updated Feb 9, 2026
Search Tags:#git#pull request#github#worktree#merge#rebase#conflict resolution
One-click install
npx skills add https://github.com/ousiass/claude-config --skill resolve-conflicts-en
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflicts-en
Source: https://github.com/ousiass/claude-config/tree/main/skills/resolve-conflicts-en
Command: npx skills add https://github.com/ousiass/claude-config --skill resolve-conflicts-en

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill helps developers resolve merge conflicts in pull requests efficiently and safely by using an isolated Git worktree, preventing accidental damage to the main codebase.

Core Features & Use Cases

  • Isolated Conflict Resolution: Works in a separate Git worktree to avoid impacting your main development environment.
  • Multiple Strategies: Supports both rebase (recommended for clean history) and merge strategies for conflict resolution.
  • Guided Process: Walks you through identifying conflicts, resolving them by understanding changes, and verifying the resolution.
  • Use Case: When a pull request has merge conflicts, use this Skill to create a temporary branch, apply the necessary changes to resolve the conflicts, and then push the updated branch back to the PR.

Quick Start

Use the resolve-conflicts-en skill to resolve conflicts for pull request number 123.

Frequently Asked Questions about resolve-conflicts-en

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

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

Resolve PR conflicts safely by creating an isolated Git worktree, fetching pull request details, and applying either a rebase or merge strategy to avoid damaging your main codebase.

What is the best way to fix rebase conflicts without affecting my current Git workspace?▼

Fix rebase conflicts in a dedicated Git worktree to isolate the process from your main development environment, guiding you through manual resolution and verifying the changes before pushing.

When should I use a rebase strategy over a merge strategy for PR conflict resolution?▼

Use a rebase strategy for PR conflict resolution when you need a clean commit history, applying changes onto the base branch and facilitating a safe push using `--force-with-lease`.

How does an isolated worktree help with manual conflict resolution?▼

An isolated worktree helps manual conflict resolution by analyzing base and head branch changes in a separate directory, preventing accidental damage to your primary working codebase.

Can I use this to resolve conflicts for a specific pull request number?▼

Yes, you can resolve conflicts for a specific pull request by providing the PR number to fetch details, check for conflicts, and guide the resolution process in a temporary branch.

Why use force-with-lease when pushing rebased changes to a pull request?▼

Use `--force-with-lease` when pushing rebased changes to a pull request to safely overwrite the remote branch while preventing accidental overwrites if the remote has received new updates.

Related Skills

Explore More Software Engineering Skills→
nsheapsnsheaps
3

update-branch

Synchronize feature branches with their PR base using git and gh.

Community
Advanced
drndrn
23

rebase

Rebase the current Git branch onto the upstream default branch and force-push with lease.

Community
Advanced
tonombtonomb

resolving-merge-conflicts

Resolve git merge and rebase conflicts by analyzing commit history and reconciling code changes.

Community
Intermediate
theslashdojotheslashdojo

git-rebase

Replay commits onto a new base with interactive rebase and autosquash.

Official
Intermediate