skills.rest
nielpattin
nielpattinCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolve-conflicts

Resolve Git merge conflicts with a structured plan and test validation.

Updated Apr 21, 2026
Search Tags:#git#developer tools#collaboration#version control#merge conflicts#code resolution
One-click install
npx skills add https://github.com/nielpattin/.dotfiles --skill resolve-conflicts-nielpattin
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/nielpattin/.dotfiles/tree/main/.pi/agent/skills/resolve-conflicts
Command: npx skills add https://github.com/nielpattin/.dotfiles --skill resolve-conflicts-nielpattin

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill automates the complex and error-prone process of resolving Git merge conflicts, ensuring that changes from both branches are combined intelligently while preserving the intent of the original developers.

Core Features & Use Cases

  • Structured Resolution Plan: Creates a detailed plan before any changes are made, outlining the strategy for each conflicted file.
  • Intelligent Merging: Applies specific strategies for different file types (imports, tests, generated files, code logic) to ensure correctness.
  • Validation: Includes steps to compile and run tests after resolution to guarantee the integrity of the merged code.
  • Use Case: When a team is collaborating on a feature branch and a merge conflict arises during a pull request, this Skill can be invoked to systematically resolve the conflicts, present a clear plan, and ensure the code remains stable.

Quick Start

Use the resolve-conflicts skill to analyze and resolve the current Git merge conflicts according to the defined plan.

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 automatically?▼

You can resolve Git merge conflicts by creating a structured plan that intelligently combines changes from both branches, preserving the original developer intent while validating the merged code with tests.

How does intelligent merge conflict resolution handle deleted-modified files?▼

Intelligent merge conflict resolution handles deleted-modified files by applying specific strategies for different file types, ensuring changes are combined correctly while prioritizing the intent of both branches.

What is the best way to merge configuration and code logic from different branches?▼

The best way to merge configuration and code logic is using a structured resolution plan that applies specific strategies for each file type and validates the outcome by compiling and running tests.

Can I regenerate generated files from their sources during a merge conflict?▼

Yes, you can regenerate generated files from their sources during a merge conflict, as the resolution process prioritizes regenerating these files rather than manually combining potentially conflicting generated content.

How do I validate code integrity after resolving a merge conflict?▼

You validate code integrity after resolving a merge conflict by compiling the codebase and running tests, which guarantees the stability and correctness of the intelligently merged changes.

Does automated conflict resolution work with import and test file conflicts?▼

Yes, automated conflict resolution works with import and test file conflicts by applying targeted strategies for these specific file types to ensure the merged code remains stable and correct.

Related Skills

Explore More Software Engineering Skills→
OniroHuaverOniroHuaver
30

resolve-merge-conflicts

Resolve Git merge conflicts with compact diffs and conflict summaries.

Community
Intermediate
PacificStudioPacificStudio
264

land

Enforce CI and branch-state checks before merging Git changes.

Official
Intermediate
leafcoderleafcoder
2

git-workflow

Standardize Git practices and collaboration workflows across GitHub and Gitee.

Community
Intermediate
eivindebeivindeb

manual-merge-branches

Merge Git branches with explicit user approval for each conflict resolution.

Community
Advanced