Skills tagged: conflict-resolution

• git-orchestration-flow - Git Orchestration Flow

  gitworktreestacked-prgithub-api

  ★ 0 · Updated 2026-09-22

  Provides procedures for Git branch management, worktree isolation, stacked PR synchronization, ruleset handling, and SSOT conflict resolution.

  ⚙ Isolate worktrees for parallel tasks⚙ Detach HEAD to delete branches⚙ Prune completed or obsolete worktrees
• tato - Difficult Conversations and Negotiation Co-pilot

  communicationnegotiationconflict-resolutionfeedback

  ★ 0 · Updated 2026-09-21

  Drafts sensitive messages, prepares live talks, builds negotiation plans, structures feedback, and calibrates draft tones locally in Portuguese.

  ⚙ Draft sensitive messages⚙ Analyze received messages⚙ Prepare live conversation plans
• git-merge-resolving - Resolving Git merge and rebase conflicts

  gitmergeconflict-resolutionrebase

  ★ 0 · Updated 2026-09-21

  Resolves Git merge and rebase conflicts by analyzing commit intent, handling union conflicts, regenerating generated files, and attributing test failures.

  ⚙ Analyze commit intent from history⚙ Port additions into evolved lineage⚙ Combine union textual conflicts
• semantic-merge-adjudicator - Semantic Merge Adjudicator

  git-mergeconflict-resolutionagent-concurrencysemantic-adjudication

  ★ 70 · Updated 2026-09-19

  Classifies write conflict hunks between parallel agents as independent, redundant, or clash before re-entering test gate.

  ⚙ Match path-gated files deterministically⚙ Classify conflict hunks semantically⚙ Compose proposed resolution tree
• version-control - Manage Git repositories and collaborative workflows.

  gitversion-controlrepository-managementbranching

  ★ 57 · Updated 2026-09-19

  Equips an agent to perform Git version control tasks including repository management, branching, conflict resolution, hooks, and commit hygiene.

  ⚙ Assess repository state⚙ Stage and commit changes⚙ Manage Git branches
• agentic-jujutsu - Coordinate concurrent multi-agent repository writes

  multi-agentvcsgitconflict-resolution

  ★ 3 · Updated 2026-09-16

  Applies soft claims, worktree fan-out, and semantic 3-way merge to enable concurrent agent writes without repository lock stalls.

  ⚙ Acquire soft write claims⚙ Release active write claims⚙ List active soft claims
• ayi-nonviolent-communication - Actionable Toolkit for Nonviolent Communication

  nvcnonviolent-communicationcommunicationempathy

  ★ 177 · Updated 2026-09-15

  Converts messages into NVC four components to assist in self-coaching, statement rewriting, empathetic listening, and conflict resolution.

  ⚙ Rewrite statements into NVC elements⚙ Listen for feelings and needs⚙ Conduct self-coaching and decision making
• spectre-rebase - Safely rebase git branch with automatic conflict resolution

  gitrebaseconflict-resolutionversion-control

  ★ 161 · Updated 2026-09-14

  Rebases current git branch onto target with backup ref, auto conflict resolution, and post-rebase verification or parent handoff.

  ⚙ Create backup ref before rebasing⚙ Auto-commit uncommitted changes⚙ Rebase current branch onto target
• merge-main - Merge latest default branch changes into current branch.

  gitmergeversion-controlconflict-resolution

  ★ 0 · Updated 2026-09-13

  Merges latest default branch changes into current branch, resolves conflicts, reviews applicability, and pushes.

  ⚙ Detect default branch⚙ Check uncommitted changes⚙ Fetch remote changes
• git-rebase - Git Rebase Conflict Resolution

  gitrebaseconflict-resolution

  ★ 0 · Updated 2026-09-11

  Resolve Git merge and rebase conflicts conservatively while preserving both sides' intent and staging resolved files.

  ⚙ Inspect listed conflicted files⚙ Identify changes from both sides⚙ Edit files preserving required behavior
• rebase-assistant - Safe Git branch rebase and conflict resolution

  gitrebaseconflict-resolutionbranch-management

  ★ 18 · Updated 2026-09-11

  Guides a safe Git rebase of the current branch onto a target branch, including conflict triage and resolution steps.

  ⚙ Identify target branch⚙ Run preflight status checks⚙ Start git rebase
• Marriage - Frameworks and guidance for navigating marriage challenges.

  marriagerelationshipconflict-resolutioncommunication

  ★ 1 · Updated 2026-09-10

  Navigates marriage challenges across all stages using conflict resolution, communication tools, and practical frameworks.

  ⚙ Detect marriage stage⚙ Load relevant phase guidance⚙ Provide practical communication frameworks
• resolving-merge-conflicts - Resolve Git Merge and Rebase Conflicts

  gitmergerebaseconflict-resolution

  ★ 590 · Updated 2026-09-09

  Resolves in-progress Git merge or rebase conflicts while preserving original intent and running automated checks.

  ⚙ Inspect merge and rebase status⚙ Analyze commit history and intent⚙ Resolve conflicting code hunks
• godot-clean-conflicts - Clean Godot Conflicting Operations

  godotgame-developmentcode-analysisconflict-resolution

  ★ 18 · Updated 2026-05-28

  Detects and resolves conflicting operations in Godot code including property conflicts, duplicate signals, physics modes, and competing animations

  ⚙ scan code and scenes⚙ detect property conflicts⚙ detect signal conflicts
• openspec-bulk-archive-change - Batch Archive OpenSpec Changes

  openspecbatch-operationschange-managementarchive

  ★ 0 · Updated 2026-03-25

  Archive multiple completed changes in a single operation with intelligent conflict resolution.

  ⚙ list active changes⚙ prompt user for selection⚙ validate changes
• consensus-voting - Multi-Agent Consensus Voting

  multi-agentconsensusvotingdecision-making

  ★ 57 · Updated 2026-03-20

  Implements voting protocols and agreement algorithms for multi-agent consensus

  ⚙ Collect votes from agents⚙ Apply weighted voting⚙ Detect conflicts
• synchronizing-data - Offline-First Encrypted Data Synchronization

  offline-firstencryptionsyncconflict-resolution

  ★ 1 · Updated 2026-03-19

  Implements offline-first sync with encrypted local storage and intelligent conflict resolution

  ⚙ encrypt data⚙ store data locally⚙ detect conflicts
• inter-model-arbitration - Inter-Model Arbitration for AI Collaboration

  governanceai-to-aiconflict-resolutionarbitration

  ★ 2 · Updated 2026-02-17

  Resolves disputes and conflicts between AI models during collaborative tasks.

  ⚙ Monitor interactions for conflicts⚙ Identify semantic/logical contradictions⚙ Detect resource contention
• integration-merge-manager - Parallel Branch Integration and Merge Management

  integrationmergeconflict-resolutionversion-control

  ★ 0 · Updated 2026-02-12

  Manages pre-main integration of parallel branches including merge planning, conflict resolution, and validation.

  ⚙ create integration branch⚙ switch to integration branch⚙ merge track branches
• crdt - CRDT State Management with Loro for File Operations

  CRDTstate-managementsyncconflict-resolution

  ★ 2 · Updated 2026-02-12

  Manage state using Loro CRDT with loro-mirror for files in src/lib/crdt/

  ⚙ manage CRDT state with loro-mirror⚙ work on files in src/lib/crdt/⚙ apply draft-style mutations

Scroll to load more