sjunepark/agent-scripts

merge-branch

Integrate Git branches deliberately: plan or dry-run merges, transplant work, resolve conflicts, or audit completed or in-progress merges.

소스 보기

사용 방법

  1. 설치 명령을 복사하고 자신의 에이전트 환경에 설치하기 전에 소스 패키지를 확인하세요.
  2. 필요한 도구, 인증 정보, 지원 환경은 원본 문서에서 확인하세요.
  3. 입력과 원하는 산출물을 설명하고 출처와 결과를 대조하세요.
npx skills add https://github.com/sjunepark/agent-scripts --skill merge-branch

시작 전 확인

  • 설치에는 모델 구독, API 한도, 파일 접근 권한이 포함되지 않습니다.
  • 별점 수와 설치 수는 활동 지표이며 독립적인 품질·보안 검증이 아닙니다.
원본 Skill 문서

원본 저장소의 제목, 예시, 코드, 표, 링크, 이미지를 유지해 표시합니다.

Merge Branch

Integrate branch intent, not just patches. Prefer Git's merge machinery as a draft, then edit, refactor, audit, validate, and report the deliberate result.

Use clear branch terms throughout the task: the current HEAD branch is the destination branch, and <source> is the branch being integrated into it. If the user says "target branch" ambiguously, confirm whether they mean the source branch to merge or the destination branch to receive the work.

Choose One Mode

  • Dry plan: When the user asks to analyze or plan without changing repository state, read and follow modes/dry-plan.md. A plan-only request finishes with the plan and any unresolved decisions.
  • Audit: When the user asks to review a completed or in-progress merge result, read and follow modes/audit.md. Do not start or redo a merge unless separately authorized.
  • Integrate: When the user asks to perform a merge, transplant branch work, or resolve conflicts, read and follow modes/integrate.md through the authorized committed or uncommitted endpoint.

If the request combines assessment and integration, complete the read-only mode first, then perform the already authorized integration. Ask only for consequential decisions or authority still missing from the request and inspected evidence.

Shared Guardrail

Do not move, force-update, or delete the source branch automatically. Convergence means the source tip is reachable from destination HEAD; aligning branch refs requires explicit approval.

관련 작업

같은 저장소의 Skills

더 많은 Skills

모든 Skills