resolve-merge-conflicts은(는) 무엇을 하나요?
병합 충돌 해결을 위해 전체 파일을 컨텍스트에 로드하는 대신, 해결되지 않은 경로, 충돌 청크, 간결한 diff만 추출합니다. 병합, 리베이스, 체리픽, 또는 스태시 팝이 충돌로 중단되었을 때, git status에 병합되지 않은 경로가 표시되거나, 파일에 충돌 마커가 포함된 경우 사용하세요.
병합 충돌 해결을 위해 전체 파일을 컨텍스트에 로드하지 않고, 해결되지 않은 경로, 충돌 청크, 간결한 diff만 추출합니다. 병합, 리베이스, 체리픽, 스태시 팝이 충돌로 중단되었거나, `git status`에 병합되지 않은 경로가 표시되거나, 파일에 충돌 마커가 포함된 경우 사용하세요.
이 스킬은 Git 병합 충돌을 효율적으로 해결하도록 설계된 전문 도구입니다. 충돌이 발생한 전체 파일을 로드하는 대신, `git status --short`를 통해 해결되지 않은 경로(예: UU, AA, DD)를 식별하고, 각 파일의 충돌 청크와 주변 컨텍스트, 그리고 충돌 파일 간의 간결한 diff만 추출하여 AI 에이전트의 컨텍스트를 최소화합니다. 주로 Claude Code, Cursor, Codex와 같은 AI 코딩 어시스턴트 환경에서 사용되며, `SKILL.md`를 기반으로 작동합니다. 사용자는 병합, 리베이스, 체리픽, 스태시 팝이 충돌로 인해 중단된 경우, `git status`에 unmerged 경로가 표시될 때, 또는 파일에 `<<<<<<<`와 같은 충돌 마커가 포함된 상황에서 이 스킬을 활용할 수 있습니다. 결과적으로 AI 에이전트는 충돌이 발생한 정확한 위치와 변경 사항만을 집중적으로 분석하여, 신속하고 정확한 해결 방안을 제시할 수 있습니다. 이는 개발자의 작업 흐름을 방해하지 않으면서 충돌 해결 프로세스를 간소화하고 생산성을 높이는 데 기여합니다.
npx skills add https://github.com/warpdotdev/common-skills/tree/main/skills/resolve-merge-conflictsInstalled? Explore more 코딩 & 개발 skills: steipete/bluebubbles, steipete/eightctl, steipete/blucli · View all 6 →
병합 충돌 해결을 위해 전체 파일을 컨텍스트에 로드하는 대신, 해결되지 않은 경로, 충돌 청크, 간결한 diff만 추출합니다. 병합, 리베이스, 체리픽, 또는 스태시 팝이 충돌로 중단되었을 때, git status에 병합되지 않은 경로가 표시되거나, 파일에 충돌 마커가 포함된 경우 사용하세요.
This repo contains 16 individual skills — each has its own dedicated page.
Guides creation, revision, and review of Warp- or Oz-branded assets. Use when working on launch pages, docs, HTML/CSS components, UI mockups, prompts, social assets, copy, presentations, or any other branded deliverable that should look and sound unmistakably Warp or Oz.
Compare a pull request's implementation against spec context in spec_context.md and feed any material mismatches into review.json. Use during PR review when approved or repository spec context is available.
Run a model-diverse subagent council to investigate the same problem from multiple perspectives, compare findings, and produce a final recommendation. Use this skill whenever the user asks for a council, second opinions, multiple agents/models to evaluate one question, parallel investigation, red-team/blue-team comparison, or help deciding between competing technical approaches.
Create a pull request in the warp repository for the current branch. Use when the user mentions opening a PR, creating a pull request, submitting changes for review, or preparing code for merge.
Diagnose CI failures for a PR using the GitHub CLI, extract error logs, and generate a plan to fix them. Use when the user asks to check CI status, pull CI issues, triage test failures, or investigate PR build failures.
Fix compilation errors, linting issues, and test failures in the warp Rust codebase. Covers presubmit checks, WASM-specific errors, and running specific tests. Use when the user hits build errors, clippy or fmt failures, test failures, or needs to run or interpret presubmit before a PR.
Implement an approved feature from PRODUCT.md and TECH.md, keeping specs and code aligned in the same PR as implementation evolves. Use after the product and tech specs are approved and the next step is building the feature.
Generate a static interactive D3 walkthrough of a pull request. Use when the user wants a zoomable PR map, graph/canvas PR orientation, or alternate visualization of PR system components, data flow, code dependencies, and user actions.
Launch Oz cloud agents with computer use to reproduce UI-focused bug reports, capture visual evidence, and report reproduction findings. Use when investigating a specific interactive or visual bug from an issue, ticket, support report, or prompt.
Walk users through PR review comments, fetching and displaying them first when needed, collect per-comment response decisions, apply requested fixes, and preview GitHub replies and resolutions before posting. Use when responding to PR review comments on the current branch.
Review a pull request diff and write structured feedback to review.json for the workflow to publish. Use when reviewing a checked-out PR from local artifacts like pr_diff.txt and pr_description.txt and producing machine-readable review output instead of posting directly to GitHub.
Drive a spec-first workflow for substantial features by writing PRODUCT.md before implementation, writing TECH.md when warranted, and keeping both specs updated as implementation evolves. Use when starting a significant feature, planning agent-driven implementation, or when the user wants product and tech specs checked into source control.
Create or update skills by generating, editing, or refining SKILL.md files in this repository. Use when authoring new skills or revising the structure, frontmatter, or guidance for existing ones.
Validate that a branch or pull request implementation matches introduced product, technical, security, and related specs. Use when reviewing or finishing a spec-driven change and resolving mismatches between checked-in specs and implementation.
Write a PRODUCT.md spec for a significant user-facing feature in Warp, focused on detailed behavior and validation. Use when the user asks for a product spec, desired behavior doc, or PRD, wants to define feature behavior before implementation, or when the feature is substantial or behaviorally ambiguous enough that a written spec would improve implementation or review.
Write a TECH.md spec for a significant Warp feature after researching the current codebase and implementation constraints. Use when the user asks for a technical spec, implementation plan, or architecture doc tied to a product spec.
Send and manage iMessages via BlueBubbles, including attachments, tapbacks, edits, replies, and groups.
Control Eight Sleep pods (status, temperature, alarms, schedules).
BluOS CLI (blu) for discovery, playback, grouping, and volume.
Create, search, and manage Bear notes via grizzly CLI.
Capture frames or clips from RTSP/ONVIF cameras.
Search GIF providers with CLI/TUI, download results, and extract stills/sheets.