9 tagged conflict-resolution, measured the same way as everything else here.
Skill Claude CodeCodex
Entity-level semantic merge driver for Git. Resolves conflicts at the function/class level instead of the line level, so two changes to different functions in the same file never conflict.
Knuckles-Team/repository-manager
Skill Claude CodeCodex
Land a branch into a shared base that dozens of other lanes are landing into at the same time, and reconcile it when it conflicts. Covers the serialized merge queue, per-repository gate declarations, differential gating against a base ref that is legitimately red, measuring the MERGED tree rather than the branch tip…
At most 3 mods per repository are shown here, and a mod shipped inside a plugin is left to that plugin's page — the rest are on their repository pages: