Results for “merge-tree”

Sync main, rebase active worktrees, and clean up merged branches safely.

Tears down a merged PR's worktree and feature branch, verifying merge status on GitHub before deleting local and remote branches and switching back to the main worktree.

Use when merging a single GitHub pull request. Handles pre-flight checks, waits for CI, and executes the merge with the repo's default method or merge queue.

Sync the branch with the latest `origin/main`, merge `origin/main`, resolve conflicts end-to-end, then commit and push the current branch.

Integrate an exact reviewed PR under repository policy, choose truthful history semantics, and verify cleanup

Safely upsert, inspect, review, or explicitly merge the pull request for an issue-backed work branch

동시에 굴리던 여러 워크트리를 한 번에 통합합니다. 각 워크트리와 연결된 이슈를 확인하고 증거로 실제 해결 여부를 판정한 뒤, merge 를 시도하기 전에 충돌을 확정하고 계획한 순서대로 누적 검증해 순서 때문에 깨지는 경우까지 잡아냅니다. 충돌은 작업 브랜치 쪽에서 양쪽 의도를 보존하는 방향으로 해소해 승인받고, 비판 서브에이전트로 모호성을 걸러낸 다음 PR 을 merge 하고 통합 테스트로 재검증하고 이슈를 닫습니다. `$issue-merge`, "워크트리 전부 merge", "이슈들 통합", "PR 충돌 해결하고 합쳐줘" 요청과 issue-end 에서 merge 를 선택했을 때 사용합니다.

Merges mature lessons from a domain memory file into its instruction file, preserving knowledge with minimal redundancy.

Safely analyzes and cleans up local git branches and worktrees by categorizing them as merged, squash-merged, superseded, or active work.

Facilitates a read-only standup across git worktrees, branches, or PRs to compare changes and produce one consolidation plan.

Use when you need to resolve an in-progress git merge/rebase conflict.

Use when you need to resolve an in-progress git merge/rebase conflict.

Manage git worktrees using a centralized worktrees folder. Use for parallel development, PR reviews, or isolated work.

Git Worktree Manager

Composite skill — one-pass cleanup of stale local branches, dead worktrees, merged branches, and abandoned remote PR branches. Chains `git fetch --prune` → `clean_gone` (kill [gone] branches) → worktree prune + offer-to-remove dead worktrees → list-and-delete branches merged to main and release → delete remote PR branches whose PRs merged >7 days ago. Use instead of running `clean_gone` alone — that only catches half the rot. Daily-friction composite; fires on "clean up branches", "branch hygiene", "stale worktrees", and on session start when local branch count > 30.

Pre-Merge Brief

Use when a finished, reviewed branch is committed and needs to be merged into the default branch in a repo that integrates directly to `main` (not via pull request).

Composite skill — take a PR from "I think it's ready" to merged with full gate verification. Chains pr-merge-readiness (verdict) → ci-watch / gh-fix-ci (if blockers) → gh-address-comments (if review needed) → ship (when verdict is MERGE). Use as the one-call answer to "can I merge this?" instead of running 4 skills sequentially.

当用户明确要求“解决当前 merge / rebase / cherry-pick 冲突、提交代码、创建 commit、把改动分批提交并 push、推送当前分支”时使用。进行中的冲突要先识别 Git 操作和双方原始意图，逐 hunk 做语义合并并运行项目检查，再经用户确认继续操作；普通改动要检查敏感信息与异常差异，拆成可运行、可审查、可回滚的原子提交后确认提交和推送。不得自动发起或中止 merge / rebase / cherry-pick，不得强推或随意改写已发布历史。不要用于普通改动尚未完成或验证失败、只想查看 Git 状态，或要创建 PR 的场景。

Git worktree patterns for isolated parallel development. Use when creating feature branches, managing git worktrees, isolating feature work, parallel development, setting up a worktree, listing worktrees, worktree naming conventions, or cleaning up worktrees.

Finalizes a hotfix and merges it into main and develop using git-flow, then prunes stale branches and worktrees. This skill should be used when the user asks to "finish a hotfix", "merge hotfix branch", "complete hotfix", "git flow hotfix finish", or wants to finalize a hotfix.

Finalizes and merges a feature branch into develop using git-flow, then prunes stale branches and worktrees. This skill should be used when the user asks to "finish a feature", "merge feature branch", "complete feature", "git flow feature finish", or wants to finalize a feature branch.

B-Tree Indexes