skills.rest
not-subhu
not-subhuCOMMUNITY
Explore all skills by this author →
GitHub

merge-resolution

Guide git merge conflict resolution with step-by-step instructions and automated verification.

Updated Jun 30, 2026
Search Tags:#git#merge conflict#rebase#developer tool#resolution
One-click install
npx skills add https://github.com/not-subhu/screech --skill merge-resolution
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-resolution
Source: https://github.com/not-subhu/screech/tree/main/.local/skills/merge-resolution
Command: npx skills add https://github.com/not-subhu/screech --skill merge-resolution

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill assists users in resolving git merge conflicts, providing step-by-step instructions and verification processes to ensure a smooth and accurate resolution.

Core Features & Use Cases

  • Conflict Resolution Guidance: Offers detailed instructions for resolving merge conflicts in git repositories.
  • Automated Verification: Verifies the resolution of conflicts after manual intervention, ensuring no markers remain.
  • Use Case: When you encounter a merge conflict during a git rebase or merge, this Skill guides you through the process, from inspecting files to finalizing the resolution.

Quick Start

Use the merge-resolution skill to continue resolving your git merge conflict.

Frequently Asked Questions about merge-resolution

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

FAQPage Schema
How do I resolve a git merge conflict during a rebase?▼

Yes, automated verification confirms your merge conflict resolution is complete by checking that no conflict markers remain in the git repository. This ensures your manual edits are clean before finalizing the merge or rebase.

What is the best way to fix git merge conflicts without losing changes?▼

The best way to fix git merge conflicts is to follow structured step-by-step instructions for inspecting files and applying resolution strategies. This ensures both conflicting branches are accurately merged without losing data.

Do I need to know git commands to use automated merge conflict resolution?▼

Yes, you need existing knowledge of git commands and conflict resolution strategies to effectively use this guidance. The skill supplements your git expertise with structured steps and verification rather than replacing foundational command knowledge.

Why does my git rebase stop when there is a merge conflict?▼

A git rebase stops when there is a merge conflict because git requires manual intervention to reconcile overlapping file changes. This skill guides you through inspecting the files and resolving the conflict so the rebase can continue.

Related Skills

Explore More Software Engineering Skills→
FutureAtomsFutureAtoms
1

git-github-merge

Automates Git merge operations with selectable fast-forward, merge-commit, squash strategies and conflict previews.

Community
Intermediate
ViewWayViewWay

Git

Enforce safe Git workflows with commit hygiene and branch policies.

Community
Advanced
jimmymalhanjimmymalhan
1

conflict-resolution

Resolve Git merge conflicts by stashing changes, pulling main, and verifying codebase integrity.

Community
Advanced
pramudityadpramudityad

vscode

Compare file versions and view diffs in VS Code via the code CLI.

Community
Basic