conflict-resolution
weave
Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.
- 1.4k
- Rust
- Apache-2.0
- 14 h ago
SocialCoach
Your personal EQ coach. Build social skills and learn to handle conflict through realistic role-play and personalized feedback.
- 489
- TypeScript
- Apache-2.0
- 13 d ago
GitWand
The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
- 199
- TypeScript
- MIT
- 2 d ago
PullRequestDashboard
Local merge analysis dashboard that clusters PRs semantically and generates interactive dependency conflict DAGs.
- 7
- YAML
- 6 d ago
BlastMerge
Cross-repository file synchronization tool that uses intelligent iterative merging to unify multiple file versions with interactive conflict resolution.
- 1
- C#
- MIT
- 5 d ago
Cognitive-Conflict-Resolution-Model-
This model defines a structured method by which an intelligent agent resolves internal cognitive conflict using layered logic negotiation and dynamic priority realignment. It enables context-sensitive decision-making and stable behavior generation. 本モデルは、知的エージェントが内部の認知的葛藤を、階層的な論理交渉と動的な優先順位の再調整を通じて解決する構造化手法を定義します。これにより、文脈に応じた意思決定と安定した行動生成が可能になります。
- 0
- 17 mo ago



