Skills
.Work. You
Rest

resolve-conflicts-en

Community

Safely resolve PR conflicts in a worktree.

Software Engineering#git#pull request#github#worktree#merge#rebase#conflict resolution
Authorousiass
Version1.0.0
Installs0

System Documentation

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.

Dependency Matrix

Required Modules

None required

Components

scriptsreferences

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: resolve-conflicts-en
Download link: https://github.com/ousiass/claude-config/archive/main.zip#resolve-conflicts-en

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.