claude

conflicts

Git merge conflict resolution agent that analyzes intent behind changes on both branches

6 on GitHubby Nick Misasiv1.0.0MITupdated 17 days agogit
/

Plugin conflicts from marketplace mattermost-ai-marketplace in mattermost/mattermost-ai-marketplace. Commands read from the repo's manifest — 17 days ago.

What it installs

Skills (1)

  • conflicts

    Resolve git merge conflicts by analyzing change intent across branches. Use when the user asks to resolve merge conflicts, sync a branch, merge branches, or when a git merge produces conflicts.

View source on GitHub

More from mattermost/mattermost-ai-marketplace

All 20 plugins →

8-phase, gated UX specification pipeline for DoD/defense collaboration features — orchestrator + phase agents + composable skills, from problem brain-dump to publish-ready spec

26 skills · 12 commands · 8 agents · hooks

6

Turn a PRFAQ into shareable, multi-option interactive prototypes for faster alignment — parse the PRFAQ, align on scope and options with the human, then build into a swappable sandbox playground on the app's real layouts

10 skills · 1 command · 3 agents

6

Internal Cursor automation commands for Mattermost engineering workflows. Intended to be invoked by Cursor Automations only — not for individual/manual use.

3 skills · 3 commands

6

Skills for common development workflows — dependency management, module hygiene, and routine maintenance tasks

3 skills

6

Adversarial security review using a paranoid finder and a critical validator over a PR, local diff, or file list, with full-coverage accounting, finder/validator context isolation, and a code-traced attack-example gate

1 skill · 2 agents

6

Similar plugins

Commands for git commit workflows including commit, push, and PR creation

3 commands

anthropics/claude-code 155,476

Advanced git workflows with diff analysis, risk scoring, and reviewer recommendations

2 skills · 1 command · 1 agent

ruvnet/ruflo 81,589

Perform AI code review on Git diffs — supports workspace changes, branch ranges, and single commits with concurrent per-file analysis, codebase search, and deep context-aware review.

2 commands

alibaba/open-code-review 50,068

Commands for git commit workflows including commit, push, and PR creation

3 commands

anthropics/claude-plugins-official 47,076

Essential developer skills including Git workflows, SQL optimization, error handling, code review, E2E testing, authentication, debugging, and monorepo management

11 skills · 1 agent

wshobson/agents 42,461

GitKraken

claude

Gives Claude access to your real Git and project context: commits, branches, pull requests, and issues across every repo you work in. Works with GitHub, GitLab, Azure DevOps, Bitbucket, and Jira.

anthropics/knowledge-work-plugins 35,601

Maintain 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 plugins20 plugins