intuitive-port-worktree

Intuitive Port Worktree

Use this skill to move a change set from a source worktree into the target default repo checkout while preserving the target checkout's current branch.

The operation name depends on the method:

• cherry-pick: replay one or more source commits directly.
• apply a patch: apply a diff generated from the source.
• manual patch port or manual cherry-pick: map the same intent into a target branch whose files or APIs have diverged.
• port changes or transplant changes: generic phrasing for this workflow.

Operating Rule

Do not switch the target repo to the source branch unless the user explicitly asks. The target repo's current branch is the destination.

If source and target paths are explicit, execute autonomously. Ask only when the source payload or target repo is ambiguous enough that the wrong choice would overwrite unrelated work.

Discovery

Collect this before editing:

• status, root path, branch, recent commits, and target worktree list;
• whether source and target share rev-parse --path-format=absolute --git-common-dir.

If they do not share a git common dir, the workflow can still use patches, but commit refs from the source may not resolve in the target.

Payload Selection

Prefer the smallest faithful payload:

1. If the user names commit hashes, use those commits.
2. If the source branch has local commits not in target, inspect the range from the merge base to source HEAD.
3. If the source worktree is dirty, include staged and unstaged diffs only after confirming they are intentional from git status and git diff --stat.
4. If both commits and dirty changes exist, port commits first, then dirty diffs.

Inspect commit ranges and dirty diffs with git log --oneline --reverse and git diff --stat before selecting the payload.

Safety Gate

Before modifying the target:

• Read the target status. Do not overwrite unrelated target changes.
• If target is dirty, check whether changed paths overlap the port. If they do, stop and ask; otherwise keep the edits separate.
• Create a lightweight backup-before-port-<timestamp> branch in the target.