사용 방법
- 설치 명령을 복사하고 자신의 에이전트 환경에 설치하기 전에 소스 패키지를 확인하세요.
- 필요한 도구, 인증 정보, 지원 환경은 원본 문서에서 확인하세요.
- 입력과 원하는 산출물을 설명하고 출처와 결과를 대조하세요.
npx skills add https://github.com/anorth/agent-skills --skill land-to-main시작 전 확인
- 설치에는 모델 구독, API 한도, 파일 접근 권한이 포함되지 않습니다.
- 별점 수와 설치 수는 활동 지표이며 독립적인 품질·보안 검증이 아닙니다.
원본 저장소의 제목, 예시, 코드, 표, 링크, 이미지를 유지해 표시합니다.
Land to Main
Land the current work branch onto local `main`. Remotes are out of scope — do not push or pull.
Preconditions (fail fast)
- Not on `main`: if
HEADismain, refuse and stop. - Clean tree: if there are uncommitted changes (staged or unstaged), stop. Do not commit as part of landing.
- Already landed: if work branch and
mainpoint at the same commit, report that and stop (nothing to do).
Workflow
Run these steps in order. Stop and wait for the user on any unexpected failure.
1. Inspect history
Review commits on the work branch that are not on main (git log main..HEAD).
- Normally land as-is.
- If any look like WIP / temporary / "fixup later" commits, ask before continuing. Do not squash or rewrite unless the user asks.
2. Rebase onto local main
git rebase main- Simple conflicts (obvious one-sided or mechanical): resolve,
git add, continue. - Complex or semantic conflicts: stop, explain the conflict, wait for direction.
- Never use
git rebase -i.
3. Lint and test
- Prefer the project's documented lint and test entrypoints.
- Run lint, then tests. Fail-stop on either — do not fast-forward if either fails.
- Do not run a full production build unless the project documents that as the check to use.
4. Fast-forward main
main is typically checked out in another worktree, so do not git checkout main here.
Only after lint and tests succeed:
- Find the worktree that has
main:git worktree list - Fast-forward that checkout to this branch tip (stay in the work-branch worktree):
git -C <main-worktree-path> merge --ff-only <work-branch-tip>Use the work branch name or its SHA for <work-branch-tip>.
--ff-onlyonly — if FF is not possible, stop and ask (do not create a merge commit).- If the main worktree has local changes, the merge should fail; abort and report — do not dirty-merge or stash there.
- If no worktree has
main, you can directlygit push . HEAD:main. Do not force push. - Stay on the work branch. Do not delete any branches.
5. Verify
Confirm work branch and main are the same commit (e.g. git rev-parse HEAD vs git -C <main-worktree-path> rev-parse HEAD).
6. Close tickets
Find the tickets the landed commits resolve (from commit messages, or the ticket this work started from). Close each in the project's tracker; skip any that are already closed. Leave open any ticket the work only partly addresses.
7. Report
Report briefly: branch name, new main tip (short SHA + subject), that checks passed, and the tickets closed and left open.
Hard rules
- Local
mainonly — no remote fetch/pull/push. - Do not commit, amend, squash, or otherwise rewrite history unless the user explicitly asks.
- Do not delete branches.
- End on the work branch, with
mainfast-forwarded to match. - If unsure how to proceed: stop and wait for the user.

