Results for “merge-conflict”

`analysis-agent`/`task-agent`/`review-agent`: use when merges, rebases, conflicts, history rewrite, generated files, or recovery need evidence; skip when Git is irrelevant.

Merge the winning agent's branch into base, archive losers, and clean up worktrees. Use when the user runs /hub:merge or asks to land the winning AgentHub result and tidy the session.

Merge the winning agent's branch into the base branch, archive losing branches via git tags, and clean up worktrees after an AgentHub competition session.

Merges agent or review outputs into one deduplicated, evidence-linked, severity-ranked actionable report.

Merge multiple fine-tuned models using mergekit to combine capabilities without retraining, covering SLERP, TIES-Merging, DARE, Task Arithmetic, linear merging, and production deployment strategies.

Merge the winning agent's branch into base, archive losers, and clean up worktrees.

Merge the winning agent's branch into base, archive losers, and clean up worktrees.

Merge the winning agent's branch into base, archive losers, and clean up worktrees. Use when the user runs /hub:merge or asks to land the winning AgentHub result and tidy the session.

Merge multiple fine-tuned models using mergekit to combine capabilities without retraining. Use when creating specialized models by blending domain-specific expertise (math + coding + chat), improving performance beyond single models, or experimenting rapidly with model variants. Covers SLERP, TIES-Merging, DARE, Task Arithmetic, linear merging, and production deployment strategies.

Merge multiple fine-tuned models using mergekit to combine capabilities without retraining. Use when creating specialized models by blending domain-specific expertise (math + coding + chat), improving performance beyond single models, or experimenting rapidly with model variants. Covers SLERP, TIES-Merging, DARE, Task Arithmetic, linear merging, and production deployment strategies.

Use with analysis-agent or task-agent for task-local transaction, isolation, and conflict decisions. Do not use without a transaction decision or as task owner.

Route local Git work into the safest next move: branch hygiene, selective staging, commit cleanup, merge-vs-rebase choice, conflict resolution, lease-safe pushes, and recovery from resets or bad history edits. Use when the user needs help preparing a branch, cleaning up commits, syncing with an updated base, resolving local Git conflicts, pushing rewritten history safely, recovering lost commits, or getting a diff ready for review. Not for hosted PR review, repo administration, or sprint planning.