Merge Strategy
marcus/sidecar
Git merge strategies, conflict resolution approaches, merge vs rebase recommendations, and branch integration patterns in sidecar.
Coordinate parallel feature development with file ownership strategies, conflict avoidance rules, and integration patterns for multi-agent implementation.
$ npx skills add wshobson/agents --skill parallel-feature-development -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install wshobson/agents parallel-feature-development --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/wshobson/agents.git skills-src && mkdir -p .claude/skills && cp -r skills-src/plugins/agent-teams/skills/parallel-feature-development .claude/skills/parallel-feature-development && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "parallel-feature-development" agent skill from https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-development into .claude/skills/parallel-feature-development/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "parallel-feature-development", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-developmentType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add wshobson/agents --skill parallel-feature-development -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install wshobson/agents parallel-feature-development --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/wshobson/agents.git skills-src && mkdir -p .agents/skills && cp -r skills-src/plugins/agent-teams/skills/parallel-feature-development .agents/skills/parallel-feature-development && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "parallel-feature-development" agent skill from https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-development into .agents/skills/parallel-feature-development/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "parallel-feature-development", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add wshobson/agents --skill parallel-feature-development -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install wshobson/agents parallel-feature-development --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/wshobson/agents.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/plugins/agent-teams/skills/parallel-feature-development .cursor/skills/parallel-feature-development && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "parallel-feature-development" agent skill from https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-development into .cursor/skills/parallel-feature-development/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "parallel-feature-development", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/wshobson/agents.git --path plugins/agent-teams/skills/parallel-feature-development--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add wshobson/agents --skill parallel-feature-development -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install wshobson/agents parallel-feature-development --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/wshobson/agents.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/plugins/agent-teams/skills/parallel-feature-development .gemini/skills/parallel-feature-development && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "parallel-feature-development" agent skill from https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-development into .gemini/skills/parallel-feature-development/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "parallel-feature-development", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install wshobson/agents parallel-feature-developmentInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add wshobson/agents --skill parallel-feature-development -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/wshobson/agents.git skills-src && mkdir -p .github/skills && cp -r skills-src/plugins/agent-teams/skills/parallel-feature-development .github/skills/parallel-feature-development && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "parallel-feature-development" agent skill from https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-development into .github/skills/parallel-feature-development/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "parallel-feature-development", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add wshobson/agents --skill parallel-feature-development -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install wshobson/agents parallel-feature-development --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/wshobson/agents.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/plugins/agent-teams/skills/parallel-feature-development .opencode/skills/parallel-feature-development && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "parallel-feature-development" agent skill from https://github.com/wshobson/agents/tree/main/plugins/agent-teams/skills/parallel-feature-development into .opencode/skills/parallel-feature-development/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "parallel-feature-development", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
parallel-feature-developmentCoordinate parallel feature development with file ownership strategies, conflict avoidance rules, and integration patterns for multi-agent implementation.
Parallel Feature Development is an agent skill from wshobson/agents. 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 APIs before they…
Its SKILL.md is about 1.7k tokens, which your agent loads only when the skill is triggered. The skill folder holds 3 other files, including reference files (for example `references/file-ownership.md` and `references/merge-strategies.md`).
It sits in Development, covering Third-party API integration and Git workflow. The repository describes itself as: Multi-harness agentic plugin marketplace for Claude Code, Codex, Cursor, OpenCode, GitHub Copilot, Google Antigravity, and Pi. The licence is MIT.
4 steps, taken from the first numbered list in SKILL.md.
Read from SKILL.md and the folder at commit 46891e7. It shows what the files ask for, not the result of running them.
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
No scripts in the folder and no shell commands in SKILL.md (its code samples are typescript).
From the folder's file list and the shell code blocks in SKILL.md.
No URLs in SKILL.md.
From URLs in SKILL.md, links to its own repository left out.
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Parallel Feature Development loads about 1.7k tokens when it runs, and up to ~2.9k if it reads all its reference files. Until then it costs about 164 tokens; SKILL.md has 576 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
The full file from wshobson/agents at commit 46891e7, republished under its MIT licence (© wshobson). 576 words, ~1,658 tokens.
.claude/skills/parallel-feature-development/SKILL.md (or your agent's skills folder). This skill also uses 2 other files; get the full folder from GitHub.Strategies for decomposing features into parallel work streams, establishing file ownership boundaries, avoiding conflicts, and integrating results from multiple implementer agents.
Assign each implementer ownership of specific directories:
implementer-1: src/components/auth/
implementer-2: src/api/auth/
implementer-3: tests/auth/Best for: Well-organized codebases with clear directory boundaries.
Assign ownership of logical modules (which may span directories):
implementer-1: Authentication module (login, register, logout)
implementer-2: Authorization module (roles, permissions, guards)Best for: Feature-oriented architectures, domain-driven design.
Assign ownership of architectural layers:
implementer-1: UI layer (components, styles, layouts)
implementer-2: Business logic layer (services, validators)
implementer-3: Data layer (models, repositories, migrations)Best for: Traditional MVC/layered architectures.
One owner per file. No file should be assigned to multiple implementers.
If a file genuinely needs changes from multiple implementers:
When implementers need to coordinate at boundaries:
// src/types/auth-contract.ts (owned by team-lead, read-only for implementers)
export interface AuthResponse {
token: string;
user: UserProfile;
expiresAt: number;
}
export interface AuthService {
login(email: string, password: string): Promise<AuthResponse>;
register(data: RegisterData): Promise<AuthResponse>;
}Both implementers import from the contract file but neither modifies it.
Each implementer builds a complete feature slice (UI + API + tests):
implementer-1: Login feature (login form + login API + login tests)
implementer-2: Register feature (register form + register API + register tests)Pros: Each slice is independently testable, minimal integration needed. Cons: May duplicate shared utilities, harder with tightly coupled features.
Each implementer builds one layer across all features:
implementer-1: All UI components (login form, register form, profile page)
implementer-2: All API endpoints (login, register, profile)
implementer-3: All tests (unit, integration, e2e)Pros: Consistent patterns within each layer, natural specialization. Cons: More integration points, layer 3 depends on layers 1 and 2.
Mix vertical and horizontal based on coupling:
implementer-1: Login feature (vertical slice — UI + API + tests)
implementer-2: Shared auth infrastructure (horizontal — middleware, JWT utils, types)Best for: Most real-world features with some shared infrastructure.
All implementers work on the same feature branch:
Each implementer works on a sub-branch:
feature/auth
├── feature/auth-login (implementer-1)
├── feature/auth-register (implementer-2)
└── feature/auth-tests (implementer-3)Implementers are blocking each other waiting for shared code. Extract the shared piece into its own interface contract file owned by the team-lead and have implementers import from it. Neither implementer modifies the contract — they only implement against it.
Merge conflicts appear even with clear ownership rules.
A file was assigned to two agents, or a config/index file (e.g., index.ts, __init__.py) that auto-imports everything was modified by both. Designate one owner for all barrel/index files, or have the lead merge them at the end.
An implementer finishes early but the integration step is blocked. Use a staging interface: the finished implementer writes a stub or mock of the downstream dependency so the other implementer can continue working. Replace with the real implementation at integration time.
The feature decomposition turned out wrong mid-stream. Stop new work, have the lead redistribute files, and communicate the change via broadcast. Sunk cost on partially written code is acceptable — continuing with the wrong split is worse.
Tests written by one implementer fail against code written by another. Interface contracts drifted: the implementer who owns the API changed a signature without notifying the test implementer. Enforce the rule that contract files require a broadcast before modification.
© wshobson, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
SKILL.md and 2 other files (references) in plugins/agent-teams/skills/parallel-feature-development of wshobson/agents.
Open the folder on GitHubat commit 46891e7
Parallel Feature Development next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Parallel Feature Development this skillwshobson/agents | 40k | — | ~1.7k | Automated safety check: Pass | MIT | |
| Merge Strategymarcus/sidecar | 1.1k | — | ~2.1k | Automated safety check: Pass | MIT | |
| Commit Context Lookuprohitg00/agentmemory | 29k | — | ~522 | Automated safety check: Pass | Apache-2.0 | |
| Mirage VFS Adapter Authoringstrukto-ai/mirage | 3.7k | — | ~2.4k | Automated safety check: Pass | Apache-2.0 | |
| Jevgrepdzhng/jevgrep | 2.4k | — | ~741 | Automated safety check: Pass | MIT | |
| Git Worktree IsolationjnMetaCode/superpowers-zh | 8.3k | 1 repos | ~982 | Automated safety check: Pass | MIT |
marcus/sidecar
Git merge strategies, conflict resolution approaches, merge vs rebase recommendations, and branch integration patterns in sidecar.
rohitg00/agentmemory
Traces a file, function or line back to the agent session behind its current commit, using git blame and a memory lookup, and reports only what the records show.
strukto-ai/mirage
Builds or extends a custom Mirage virtual filesystem adapter for an API, database, object store or app data, with a working mount configuration and filesystem tests.
dzhng/jevgrep
A skill your agent uses for questions about how, why, or where behavior works in a repository, including questions that name a function or setting.
jnMetaCode/superpowers-zh
Sets up an isolated workspace before feature work or plan execution, preferring native worktree tools and falling back to git worktree, with instructions in Chinese.
ruvnet/agentic-flow
Quantum-resistant, self-learning version control for AI agents with ReasoningBank intelligence and multi-agent coordination
wshobson/agents
Cuts cloud spend across AWS, Azure, GCP and OCI with cost tagging, rightsizing, commitment and spot pricing models, and architecture changes.
wshobson/agents
Covers building subscription billing: billing cycles, subscription states, invoice generation, proration, tax handling and dunning for failed payments.
wshobson/agents
Profiles slow Python code with cProfile and memory profilers, then applies targeted fixes for CPU, memory, I/O and query bottlenecks.
wshobson/agents
Covers portfolio risk measurement with VaR, CVaR, Sharpe, Sortino and drawdown, plus guidance on limits, stress tests and tail risk.
wshobson/agents
Plans memory headroom, works through out-of-memory failures and watches temperature and power during long ML training jobs on NVIDIA DGX Spark.
wshobson/agents
Writes unit tests for shell scripts with Bats: error-condition tests, fixtures and mocks, cross-shell checks, parallel runs, helper files and CI integration.
Categories
Coordinate parallel feature development with file ownership strategies, conflict avoidance rules, and integration patterns for multi-agent implementation. Parallel Feature Development is an agent skill from wshobson/agents. Coordinate parallel feature development with file ownership strategies, conflict avoidance rules, and integration patterns for multi-agent implementation.
Parallel Feature Development fits situations like: decomposing a large feature into independent work streams; more agents need to implement different layers of the same system simultaneously; establishing file ownership to prevent merge conflicts in a shared codebase; designing interface contracts so parallel implementers can build against each others APIs before they are ready.
Run `npx skills add wshobson/agents --skill parallel-feature-development -a claude-code`. Or copy the skill folder (plugins/agent-teams/skills/parallel-feature-development in wshobson/agents) into .claude/skills/parallel-feature-development in your project. Claude Code loads it when a task matches its description.
Run `npx skills add wshobson/agents --skill parallel-feature-development -a codex`. Or copy the skill folder (plugins/agent-teams/skills/parallel-feature-development in wshobson/agents) into .agents/skills/parallel-feature-development in your project. Codex loads it when a task matches its description.
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add wshobson/agents --skill parallel-feature-development -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/parallel-feature-development, .gemini/skills/parallel-feature-development, .github/skills/parallel-feature-development and .opencode/skills/parallel-feature-development in your project.
SKILL.md names no scripts, command-line tools or credentials: Parallel Feature Development is instructions for the agent only.
SKILL.md contains no URLs. Any network use would come from the scripts or tools the agent runs. This is read from the text; nothing was executed.
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
Parallel Feature Development is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
About 1.7k tokens (SKILL.md is roughly 6.6k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 1.2k tokens, read only when the agent opens those files.
Skills that share tags, products or a category with Parallel Feature Development: Merge Strategy (marcus/sidecar, 1.1k stars), Commit Context Lookup (rohitg00/agentmemory, 29k stars), Mirage VFS Adapter Authoring (strukto-ai/mirage, 3.7k stars) and Jevgrep (dzhng/jevgrep, 2.4k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
wshobson (a GitHub user) maintains it in wshobson/agents, which has 40,254 GitHub stars. The repository holds 142 skills in this directory. The repository was last updated on October 5, 2026.
Source: wshobson/agents on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.