Skills
.Work. You
Rest

devops:conflict

Community

Resolve Git conflicts step-by-step.

Software Engineering#git#devops#collaboration#merge#rebase#conflict resolution
Authoratournayre
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill guides you through resolving Git merge or rebase conflicts interactively, file by file, ensuring a controlled and validated process.

Core Features & Use Cases

  • Interactive Conflict Resolution: Step-by-step guidance for each conflicted file.
  • Multiple Resolution Strategies: Choose to keep your version, the incoming version, or manually merge.
  • Use Case: When merging a feature branch into main results in conflicts, this skill will help you systematically address each file, preventing accidental overwrites and ensuring a clean merge.

Quick Start

Use the devops conflict skill to resolve merge conflicts with the main branch.

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: devops:conflict
Download link: https://github.com/atournayre/claude-personas/archive/main.zip#devops-conflict

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 223,000+ vetted skills library on demand.