Back to tags
Tag

Agent Skills with tag: conflict-resolution

19 skills match this tag. Use tags to discover related Agent Skills and explore similar workflows.

git-workflows

Advanced Git workflows including interactive rebase, bisect, worktrees, branch strategies, conflict resolution, cherry-picking, and submodules. Use when doing complex git operations, cleaning up commit history, managing multiple branches, investigating bugs with git bisect, or working on parallel features with worktrees.

gitbranch-managementconflict-resolutioninteractive-rebase
randalmurphal
randalmurphal
0

anti-conflict

Prevent file conflicts between multiple AI agents working in parallel

multi-agent-systemsagent-coordinationconflict-resolutionmerge-conflicts
ekson73
ekson73
01

conflict-resolution

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

conflict-resolutionmerge-conflictscode-integrityversion-control
troykelly
troykelly
1

merge-conflict-resolution

Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files

gitmerge-conflictsconflict-resolutionversion-control
axiomantic
axiomantic
0

git-hex-conflict-resolution

>

gitmerge-conflictsconflict-resolutionelixir
yaniv-golan
yaniv-golan
0

value-pluralism-resolver

Resolve conflicts between competing values through structured pluralistic analysis.

conflict-resolutionvalue-pluralismstructured-analysisdecision-framework
starwreckntx
starwreckntx
1

git-workflow

Activates when user needs help with git operations including branching, rebasing, merging, cherry-picking, stashing, and resolving conflicts. Triggers on "help me rebase", "fix merge conflict", "create branch", "git history", "undo commit", "squash commits", or any git workflow questions.

gitbranchingmergingrebasing
always-further
always-further
1

state-sync

Game state synchronization, snapshot systems, and conflict resolution for consistent multiplayer experience

state-syncmultiplayersnapshot-systemconflict-resolution
pluginagentmarketplace
pluginagentmarketplace
2

byterover-notion-sync

Advanced memory and knowledge management workflows for Byterover MCP Server. Use when creating implementation reports with timelines, documenting features as PRDs, or syncing project documentation folders with automatic conflict resolution. Extends basic retrieve/store operations with structured workflows for documentation, analysis, and knowledge synthesis.

knowledge-managementdocumentationconflict-resolutionworkflow-automation
RyanNg1403
RyanNg1403
4

office:calendar-management

Manage calendar events, check conflicts, handle scheduling from emails. Use when adding events or coordinating meetings to ensure proper timezone handling and conflict detection.

calendarcalendar-managementmeeting-schedulingtimezone
harperreed
harperreed
3

wp-debugging

WordPress debugging, dependency checking, and local development patterns. Use when debugging WordPress issues, checking plugin dependencies, setting up local environments, resolving conflicts, or troubleshooting errors in themes and plugins.

wordpresslocal-developmentdebuggingdependency-management
vapvarun
vapvarun
3

facilitation-patterns

Use when running meetings, workshops, brainstorms, design sprints, retrospectives, or team decision-making sessions. Apply when need structured group discussion, managing diverse stakeholder input, ensuring equal participation, handling conflict or groupthink, or when user mentions facilitation, workshop design, meeting patterns, session planning, or running effective collaborative sessions.

facilitationworkshop-designconflict-resolutionbrainstorming
lyndonkl
lyndonkl
82

negotiation-alignment-governance

Use when stakeholders need aligned working agreements, resolving decision authority ambiguity, navigating cross-functional conflicts, establishing governance frameworks (RACI/DACI/RAPID), negotiating resource allocation, defining escalation paths, creating team norms, mediating trade-off disputes, or when user mentions stakeholder alignment, decision rights, working agreements, conflict resolution, governance model, or consensus building.

stakeholder-engagementconflict-resolutionescalation-policiesgovernance-frameworks
lyndonkl
lyndonkl
82

role-switch

Use when stakeholders have conflicting priorities and need alignment, suspect decision blind spots from single perspective, need to pressure-test proposals before presenting, want empathy for different viewpoints (eng vs PM vs legal vs user), building consensus across functions, evaluating tradeoffs with multi-dimensional impact, or when user mentions "what would X think", "stakeholder alignment", "see from their perspective", "blind spots", or "conflicting interests".

persona-switchingassumption-challengingconflict-resolutionstakeholder-alignment
lyndonkl
lyndonkl
82

dialectical-mapping-steelmanning

Use when debates are trapped in false dichotomies, polarized positions need charitable interpretation, tradeoffs are obscured by binary framing, synthesis beyond 'pick one side' is needed, or when users mention steelman arguments, thesis-antithesis-synthesis, Hegelian dialectic, third way solutions, or resolving seemingly opposed principles.

critical-thinkingassumption-challengingconflict-resolutionmental-modeling
lyndonkl
lyndonkl
82

chain-roleplay-debate-synthesis

Use when facing decisions with multiple legitimate perspectives and inherent tensions. Invoke when stakeholders have competing priorities (growth vs. sustainability, speed vs. quality, innovation vs. risk), need to pressure-test ideas from different angles before committing, exploring tradeoffs between incompatible values, synthesizing conflicting expert opinions into coherent strategy, or surfacing assumptions that single-viewpoint analysis would miss.

stakeholder-engagementconflict-resolutionassumption-challengingtrade-off-analysis
lyndonkl
lyndonkl
82

csv-excel-merger

Merge multiple CSV/Excel files with intelligent column matching, data deduplication, and conflict resolution. Handles different schemas, formats, and combines data sources. Use when users need to merge spreadsheets, combine data exports, or consolidate multiple files into one.

ETLcsvexcelduplicate-detection
OneWave-AI
OneWave-AI
237

mobile-offline-support

Implement offline-first mobile apps with local storage, sync strategies, and conflict resolution. Covers AsyncStorage, Realm, SQLite, and background sync patterns.

offline-firstlocal-storagesync-strategiesconflict-resolution
aj-geddes
aj-geddes
301

Page 1 of 2 · 19 results