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

resolve-conflicts

Resolve Git merge conflicts for pull requests using isolated worktrees.

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

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps you safely and systematically resolve merge conflicts in your Git pull requests by using isolated worktrees, preventing accidental damage to your main codebase.

Core Features & Use Cases

  • Isolated Conflict Resolution: Uses git worktree to create a separate environment for resolving conflicts, keeping your main working directory clean.
  • Strategic Resolution: Supports both rebase and merge strategies, guiding you through the process.
  • Guided Steps: Provides clear instructions for fetching PR information, setting up the worktree, resolving conflicts file by file, and verifying the changes.
  • Use Case: When a pull request has merge conflicts, use this skill to create a dedicated space to fix them without affecting your current work, ensuring a clean merge.

Quick Start

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

Frequently Asked Questions about resolve-conflicts

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

FAQPage Schema
How do I resolve Git merge conflicts without affecting my current working directory?▼

To resolve Git merge conflicts safely, you can use an isolated worktree to handle conflict markers. This approach creates a separate environment for fixing pull request conflicts, keeping your main working directory clean and preventing accidental damage to your main codebase.

What is the best way to automatically fetch pull request details for conflict resolution?▼

The best way to fetch pull request details for conflict resolution is using GitHub CLI combined with Git. This setup automates fetching PR information, creating a dedicated worktree, and guiding you through rebase or merge strategies to systematically fix conflicts.

Can I use git worktree for resolving rebase conflicts on a specific pull request?▼

Yes, you can use git worktree for resolving rebase conflicts on a specific pull request. This method supports both rebase and merge strategies, guiding you through fetching PR details and handling conflict markers file by file in an isolated environment.

Do I need GitHub CLI to resolve pull request merge conflicts with worktrees?▼

Yes, you need both Git and GitHub CLI to resolve pull request merge conflicts using worktrees. The GitHub CLI is required to automate fetching the specified PR details, which are then used to set up the isolated worktree for guided conflict resolution.

How to verify changes before pushing after resolving git conflicts in a worktree?▼

To verify changes before pushing after resolving git conflicts in a worktree, follow the guided steps provided by the conflict resolution process. It systematically walks you through handling conflict markers file by file and verifying the changes before pushing to ensure a clean merge.

Related Skills

Explore More Software Engineering Skills→
zhaow-dezhaow-de

merge-pr

Merge reviewed GitHub pull requests with a merge commit.

Community
Intermediate
EdanStarfireEdanStarfire
15

github-pr-manager

Create, monitor, and merge GitHub pull requests with validation and cleanup.

Community
Intermediate
RektooooooRektoooooo
2

ios-testing

Automate iOS application testing with predefined scripts for functional and visual validation.

Community
Intermediate
namanchopranamanchopra
5

git-merge-expert-worktree

Manage Git worktree lifecycles and perform isolated merges with conflict resolution.

Community
Advanced