🎯

resolve-git-conflicts

🎯Skill

from tenfyzhong/skills-hub

What it does

Automates Git merge conflict resolution with interactive guidance, conflict detection, and smart merging strategies for clean code integration.

📦

Part of

tenfyzhong/skills-hub(7 items)

resolve-git-conflicts

Installation

Quick InstallInstall with npx

npx skills add https://github.com/tenfyzhong/skills-hub --skill resolve-git-conflicts

Need more details? View full documentation on GitHub →

2Installs

AddedFeb 10, 2026

View on GitHub Back to Skills

More from this repository6

🎯

install-nvim-plugin🎯Skill

Streamlines Neovim plugin installation and management with automated configuration and dependency handling for efficient development workflows.

🎯

analyse-issue🎯Skill

Diagnose and categorize GitHub issues by parsing metadata, labels, comments, and sentiment to provide actionable insights for project management

🎯

pr-review🎯Skill

Automates pull request code review processes with intelligent analysis, quality checks, and actionable feedback for GitHub repositories

🎯

implement-issue🎯Skill

Automates issue implementation workflow by generating structured code, tracking progress, and suggesting best practices for resolving GitHub repository issues

🎯

new-issue🎯Skill

Creates and manages GitHub issues with customizable templates, labels, and automated workflows for efficient project tracking and collaboration.

🎯

create-pr🎯Skill

Automates GitHub pull request creation with customizable branch, commit message, and review settings for streamlined collaborative development