Skip to content
cccskills
FreePublished on GitHub

base-retained-worktree-diff-3-way

base 전진 시 retained worktree diff의 3-way 재이식

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md715 B

SKILL.md (original)

Review the instructions the agent will receive before you install.

partial 이어받기에서 retained worktree의 uncommitted diff를 회수할 때: (1) 두 worktree의 HEAD를 비교해 base 전진 여부를 먼저 확인, (2) 전진했으면 파일 복사 금지, git -C <retained> diff > patch 후 git apply -3로 적용, (3) upstream이 같은 위치에 자체 fixture/테스트를 추가해 충돌이 인터리브되면 양쪽 함수를 모두 보존하는 방향으로 재구성, (4) upstream 스키마 변화(새 struct 필드)를 이식한 fixture에 반영, (5) cargo fmt 후 focused test → full test 순으로 포그라운드 검증.

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

atomic-write no-op 증명은 inode 비교로

The English summary is being prepared. Showing the original description.

zzunkie/yardlet17Updated Oct 12, 2026

availability 표시 게이트는 실행 의미 공급자와 교차 대조

The English summary is being prepared. Showing the original description.

zzunkie/yardlet17Updated Oct 12, 2026

builtin-bundle-reverify

The English summary is being prepared. Showing the original description.

zzunkie/yardlet17Updated Oct 12, 2026

builtin-bundle-reverify에 CLI fixture leg 절차 추가

The English summary is being prepared. Showing the original description.

zzunkie/yardlet17Updated Oct 12, 2026

codex CLI 플래그 실재는 설치된 바이너리 help로 검증

The English summary is being prepared. Showing the original description.

zzunkie/yardlet17Updated Oct 12, 2026

commit-range 독립 리뷰는 detached worktree에서 게이트 실행

The English summary is being prepared. Showing the original description.

zzunkie/yardlet17Updated Oct 12, 2026

See all skills by zzunkie

Report a problem with this skill