devops:conflict

Analyzes and interactively resolves Git merge or rebase conflicts step by step.

Updated Feb 24, 2026

Search Tags:#git #devops #collaboration #merge #rebase #conflict resolution

Ready to run

npx skills add https://github.com/atournayre/claude-personas --skill devops-conflict

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: devops:conflict
Source: https://github.com/atournayre/claude-personas/tree/main/devops/skills/conflict
Command: npx skills add https://github.com/atournayre/claude-personas --skill devops-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

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

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.

Frequently Asked Questions about devops:conflict

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

FAQPage Schema

How do I resolve Git merge conflicts step by step?▼

To resolve Git merge conflicts step by step, this Skill interactively guides you through each conflicted file, offering options to keep local changes, incoming changes, or manually merge. It validates the repository state to ensure all conflicts are addressed before finalizing.

What is the best way to handle rebase conflicts without losing changes?▼

The best way to handle rebase conflicts without losing changes is using an interactive step-by-step process. This Skill guides you through each file, allowing you to explicitly choose between keeping your local version, accepting the incoming rebase changes, or performing manual edits.

Can I choose which version to keep for each file during a Git conflict resolution?▼

Yes, you can choose which version to keep during Git conflict resolution. The Skill presents multiple resolution strategies for each conflicted file, allowing you to systematically select local changes, incoming changes, or perform manual edits to prevent accidental overwrites.

Does interactive conflict resolution validate the repository state before committing?▼

Interactive conflict resolution validates the repository state and ensures all conflicts are addressed before final commit or rebase continuation. This controlled process prevents accidental overwrites and guarantees a clean merge by checking every file systematically.

Why do I need a step-by-step guide for resolving merge conflicts in a feature branch?▼

You need a step-by-step guide for resolving merge conflicts to prevent accidental overwrites and ensure a clean merge. Systematically addressing each conflicted file when merging a feature branch into main provides a controlled, validated process that avoids missing conflicts.

What are the limitations of automated Git conflict resolution strategies?▼

Automated Git conflict resolution strategies are limited to keeping local changes, keeping incoming changes, or manual edits per file. For complex conflicts beyond these options, you must perform manual edits within the interactive step-by-step process to ensure correct merging.