5 skills found
Use when agents work concurrently in a codebase, shared files have recurring merge conflicts, or AGENTS.md or CLAUDE.md needs maintenance.
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
适用于需要解决正在进行的 git merge/rebase 冲突时。
Standard workflow for pulling updates from main or other branches on multi-contributor projects (including Flows apps) without silently discarding work. Guides fetching/merging, requires listing merge conflicts explicitly, analyzing ours vs theirs using conversation history and repo context, presenting prioritized recommendations, and obtaining user answers before editing conflict markers or completing the merge. Triggers: pull main, merge main, merge origin, rebase, merge conflict, unmerged pat
Coordinate parallel feature development with file ownership strategies, conflict avoidance rules, and integration patterns for multi-agent implementation. Use this skill when decomposing a large feature into independent work streams, when two or more agents need to implement different layers of the same system simultaneously, when establishing file ownership to prevent merge conflicts in a shared codebase, when designing interface contracts so parallel implementers can build against each other's
