How It Works Ecosystem

The open directory of AI agents, LLMs, MCP servers, workflows, and tools — search, compare, and track status across platforms.

Explore

Browse All AI Agents LLMs MCP Servers Tools & Frameworks

Account

Sign In Create Account Submit an Agent Saved Agents

Support

How It Works FAQ Report an Issue

Company

ATMEZ AI Solutions

© 2026 ATMEZ AI Solutions · All rights reserved.

Built with ❤️ for the AI community

All Agents LLMs MCP Servers Workflows Frameworks Tools Skills GenAI News

resolving-conflict — Agent Skill for DevOps | Genaihub

resolving-conflict

協助解決 Git Rebase 或 Merge 過程中的衝突，提供系統化的衝突解決流程。

Live

Open / InstallLast updated September 3, 2026

Description

協助解決 Git Rebase 或 Merge 過程中的衝突，提供系統化的衝突解決流程。

Author

MilesChou

Platform

cli

Pricing model

free

Categories

DevOps
Productivity

Tags

skill
smithery
DevOps
Productivity

Capabilities

1 activations
Smithery skill

Related skills

Others in the same category, ranked by how often they are opened.

flagsUse when you need to check feature flag states, compare channels, or debug why a feature behaves differently across rel…Skills · Coding
verifyUse when you want to validate changes before committing, or when you need to check all React contribution requirements.Skills · Coding
feature-flagsUse when feature flag tests fail, flags need updating, understanding @gate pragmas, debugging channel-specific test fai…Skills · Coding
githubInteract with GitHub using the `gh` CLI. Use `gh issue`, `gh pr`, `gh run`, and `gh api` for issues, PRs, CI runs, and …Skills · DevOps
healthcheckHost security hardening and risk-tolerance configuration for OpenClaw deployments. Use when a user asks for security au…Skills · Security
review-prReview-only GitHub pull request analysis with the gh CLI. Use when asked to review a PR, provide structured feedback, o…Skills · DevOps
prepare-prPrepare a GitHub PR for merge by rebasing onto main, fixing review findings, running gates, committing fixes, and pushi…Skills · DevOps
merge-prMerge a GitHub PR via squash after /preparepr. Use when asked to merge a ready PR. Do not push to main or modify code. …Skills · DevOps