anti-conflict

Prevent file conflicts between multiple AI agents working in parallel

multi-agent-systemsagent-coordinationconflict-resolutionmerge-conflicts

ekson73

01

conflict-resolution

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

conflict-resolutionmerge-conflictscode-integrityversion-control

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

0

git-hex-conflict-resolution

>

gitmerge-conflictsconflict-resolutionelixir

yaniv-golan

0