conflicts plugins

The directory indexes 7 plugins tagged “conflicts” from 3 public source repositories, with 10 skills and 0 MCP servers across the collection.

7 plugins3 repositories0 cross-runtimeIndexing methodology →

tag: conflicts Clear all

jj
by Alberto Leal
Jujutsu (jj) version control system - a Git-compatible VCS with novel features. Use when working with jj repositories, managing stacked commits, needing automatic rebasing with first-class conflict handling, using revsets to select commits, or wanting enhanced Git workflows. Triggers on mentions of 'jj', 'jujutsu', change IDs, or operation log.
Codex1 Skill
22Updated 2 weeks ago
build
by Mikita Taukachou
Conflict resolution, commit summaries, quick commits, and findings fixes
Claude Code5 Skills
2Updated last week
edloidas-build
by Mikita Taukachou
A Codex-safe build bundle for merge-conflict resolution, commit creation, findings triage, and live behavioral probes.
Codex
2Updated last week
merge-main
by Christopher Boone
Fetch and merge the base branch into the current feature branch with automatic conflict resolution.
Claude Code1 Skill
2Updated 2 weeks ago
merge-main
by Christopher Boone
Fetch and merge the base branch into the current feature branch with automatic conflict resolution.
Claude Code1 Skill
2Updated 2 weeks ago
rebase-onto-main
by Christopher Boone
Fetch and rebase the current feature branch onto the base branch with automatic conflict resolution and force-with-lease push.
Claude Code1 Skill
2Updated 2 weeks ago
rebase-onto-main
by Christopher Boone
Fetch and rebase the current feature branch onto the base branch with automatic conflict resolution and force-with-lease push.
Claude Code1 Skill
2Updated 2 weeks ago