claude

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

1 on GitHubv1.0.0updated 30 days ago
/

Plugin resolving-merge-conflicts from marketplace awesome-agency in dotknewt/awesome-agency. Commands read from the repo's manifest — 30 days ago.

What it installs

Skills (1)

  • resolving-merge-conflicts

    Use when you need to resolve an in-progress git merge/rebase conflict.

View source on GitHub

More from dotknewt/awesome-agency

All 85 plugins →

Core skills library for Claude Code: TDD, debugging, collaboration patterns, and proven techniques

15 skills · hooks

1

Durable project memory in a git-native vault/ — atomic knowledge notes, ADRs, docs and provenance-bearing sources with a structural linter, retrieval and curation subagents, /vault-find /vault-save /vault-session /vault-review commands, and vault-audit / vault-research workflows. Backed by the mcpvault MCP server.

6 skills · 3 agents · 1 MCP server · hooks

1

steward

claude

Unified repo stewardship: a /maintain orchestrator deploys read-only maintainer agents for user docs, spec docs, project instructions, cross-project conventions, and structured schemas/manifests, merges their drift findings into one prioritized report, and applies approved fixes through bundled skills that audit, revise, and restructure AGENTS.md (and legacy CLAUDE.md), scaffold project conventions, and keep docs/STATE.md current. Report-and-propose - nothing is applied without approval.

7 agents

1

Scaffold GitHub repo metadata — issue templates and CI workflows. /github-scaffold picks the task; /create-issue-template and /scaffold-ci-workflow run the subtasks. Includes the branch-warden agent for automated branch prep and cleanup, and the issue-filer agent for lightweight issue creation.

2 agents

1

Patterns and techniques for evaluating and improving AI agent outputs. Use this skill when: - The user makes an ad-hoc, in-session request to double-check, critique, or review your own output before…

1 skill

1

Use when deciding which model an agent or subagent should run on, or reviewing an existing assignment. Triggers on "which model should this agent use", "assign a model", "is haiku enough for this…

1 skill

1

Maintain resolving-merge-conflicts?

This page updates itself from your repo. Add the badge to your README, or get it Featured to pin it above the organic results with a followed link to your site.

claude & codex plugins85 plugins