skills.rest
AgentSystemLabs
AgentSystemLabsOFFICIAL
Explore all skills by this author →
GitHub

resolve-conflict

Resolve Git merge, rebase, or cherry-pick conflicts by inspecting marker intent and regenerating affected artifacts.

121|2|Updated Apr 24, 2026
Search Tags:#git#code generation#merge conflicts#rebase#lockfile regeneration#safe resolution
One-click install
npx skills add https://github.com/AgentSystemLabs/core --skill resolve-conflict-agentsystemlabs
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-conflict
Source: https://github.com/AgentSystemLabs/core/tree/main/plugins/agentsystem-core/skills/resolve-conflict
Command: npx skills add https://github.com/AgentSystemLabs/core --skill resolve-conflict-agentsystemlabs

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

It prevents the dangerous failure mode of “pick ours/theirs” by guiding you through understanding both sides of each conflict block before choosing a resolution.

Core Features & Use Cases

  • Detects the in-progress Git operation (merge vs rebase vs cherry-pick) and inventory unmerged/conflicted paths.
  • Resolves lockfile conflicts safely by selecting the appropriate side and regenerating the lockfile from the merged manifest, avoiding hand-merging.
  • Resolves source conflicts with intent awareness by analyzing each conflict marker block, combining complementary changes, and stopping when blocks are incompatible so you can choose intentionally.
  • Rebuilds conflicted generated artifacts by regenerating them from the resolved source (e.g., codegen outputs), rather than hand-editing.
  • Use case: You hit a conflict while rebasing a feature branch that touched both app logic and generated code—this skill helps you resolve lockfiles first, then fix source with per-block intent, then regenerate the outputs so everything stays consistent.

Quick Start

Ask the agent to resolve the current repository conflicts by walking you through the process based on your current Git state and the conflicted files.

Frequently Asked Questions about resolve-conflict

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

FAQPage Schema
How do I resolve git merge conflicts without breaking lockfiles or generated code?▼

Resolve git merge conflicts safely by selecting the appropriate side for lockfiles and regenerating them from the merged manifest, then rebuilding generated artifacts from resolved source rather than hand-editing.

What's the best way to handle incompatible source code blocks during a git rebase?▼

Handling incompatible source blocks during a git rebase requires per-block intent analysis, stopping to surface incompatible blocks so you can choose a resolution intentionally rather than blindly picking ours or theirs.

How does safe per-block conflict resolution work for cherry-pick conflicts?▼

Safe per-block conflict resolution for cherry-pick conflicts works by inspecting each conflict marker, combining complementary changes, and preserving both sides' intent before staging results and continuing the Git operation.

Can I regenerate lockfiles automatically after a merge conflict instead of hand-merging?▼

You can regenerate lockfiles automatically after a merge conflict by selecting the appropriate manifest side and regenerating the lockfile from the merged manifest, completely avoiding dangerous hand-merging.

When do I need to rebuild generated artifacts during a git conflict resolution?▼

You need to rebuild generated artifacts during git conflict resolution when codegen outputs are conflicted, regenerating them from the resolved source files to ensure everything stays consistent across the codebase.

Why does picking ours or theirs cause problems when resolving git conflicts?▼

Picking ours or theirs causes problems because it ignores the intent of both sides, risking broken behavior in semantic cases where combined results must preserve complementary changes across source files and lockfiles.

Related Skills

Explore More Software Engineering Skills→
jcdendritejcdendrite
4

git-state-safety

Inspect other refs read-only during Git merge, rebase, or cherry-pick conflicts.

Community
Intermediate
MilesChouMilesChou
1

Resolving-Conflict

Resolve Git conflicts during rebase or merge operations.

Community
Basic
d-o-hubd-o-hub
11

memory-mcp

Configure and operate the Memory MCP server for episodic memory retrieval and pattern analysis.

Community
Advanced
axiomanticaxiomantic
8

resolving-merge-conflicts

Resolve Git merge conflicts by synthesizing both sides into resolved files.

Official
Intermediate