skills.rest
JimmyTranDev
JimmyTranDevCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-conflict-resolution

Analyze git merge conflicts and apply resolution strategies with verification.

1|Updated Sep 12, 2025
Search Tags:#git#workflows#resolution#merge-conflicts#rebasing#diff3
One-click install
npx skills add https://github.com/JimmyTranDev/dotfiles --skill git-conflict-resolution
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-conflict-resolution
Source: https://github.com/JimmyTranDev/dotfiles/tree/main/src/opencode/skills/git-conflict-resolution
Command: npx skills add https://github.com/JimmyTranDev/dotfiles --skill git-conflict-resolution

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve git merge conflicts correctly by understanding both sides, choosing the right strategy, and verifying the result.

Core Features & Use Cases

  • Conflict marker anatomy (diff2 and diff3) explanation to identify changes from each branch.
  • Resolution decision tree covering import/dependency, function/logic, configuration, and style conflicts.
  • Post-resolution verification steps: check conflict markers, build, tests, linter, and diff review.

Quick Start

Identify conflicted files, inspect both sides of each conflict, apply a chosen resolution strategy, and verify the merge before committing.

Frequently Asked Questions about git-conflict-resolution

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

FAQPage Schema
How do I resolve git merge conflicts when rebasing a feature branch?▼

Resolve git merge conflicts by analyzing diff3 conflict markers to understand both sides, applying a resolution decision tree for logic or configuration files, and running post-resolution verification steps.

What is the diff3 conflict marker format and when do I need it?▼

Use diff3 conflict markers during git merge conflicts to clearly identify changes from each branch, rather than just seeing the two conflicting versions without the original context.

How do I choose the best strategy to resolve configuration or code conflicts?▼

Select a conflict resolution strategy by following a decision tree covering imports, function logic, configuration, and style to appropriately merge code changes from both branches.

What are the post-resolution verification steps after fixing a git merge conflict?▼

Post-resolution verification steps involve checking for remaining conflict markers, running builds and tests, executing linters, and reviewing the diff to ensure a correct merge.

Can I resolve generated artifact conflicts using the same git workflow?▼

Apply the same structured git conflict resolution workflow to generated artifacts by analyzing both sides and selecting the appropriate strategy to resolve the merge correctly.

Related Skills

Explore More Software Engineering Skills→
cheaficheafi

roo-conflict-resolution

Resolve merge and rebase conflicts using PR context and commit intent.

Community
Intermediate
apeejay-educationapeejay-education

ship

Automate release workflows from branch merge to PR creation.

Official
Advanced
markus41markus41
1

gitworfkflows

Manage Git branching, commits, rebasing, and pull requests.

Community
Basic
AutumnsGroveAutumnsGrove
26

git-advanced

Guide interactive rebasing, conflict resolution, and branch strategies for Git workflows.

Community
Basic