resolve-merge-conflicts 是做什麼的？
解決 Git 合併衝突：僅提取未解決的路徑、衝突區塊和簡潔差異，而非將整個檔案載入上下文。適用於合併、變基、挑選提交或 stash 彈出因衝突而中斷時，或當 git status 顯示未合併路徑，或檔案包含衝突標記時。
解決 Git 合併衝突：僅提取未解決的路徑、衝突區塊和簡潔差異，而非將整個檔案載入上下文。適用於合併、變基、挑選提交或 stash 彈出因衝突而中斷時，或當 `git status` 顯示未合併路徑，或檔案包含衝突標記時。
此技能專為處理 Git 合併衝突設計，提供高效且精簡的解決方案。不同於傳統方法需要將整個衝突檔案載入上下文，它僅提取未解決的路徑、衝突區塊和緊湊的差異資訊，大幅減少 token 消耗和上下文噪音。當開發者在合併、變基、挑選提交或 stash 彈出過程中遇到衝突時，此技能會自動解析衝突結構，輸出清晰的衝突片段，讓 AI 能專注於解決實際衝突而非處理龐大的檔案內容。它支援多種 Git 操作情境，並與常見的開發工具（如 Claude Code、Cursor 等）相容。透過直接解析衝突標記和 `git status` 輸出，它提供準確且可操作的衝突解決建議，顯著提升開發效率。
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 →
解決 Git 合併衝突：僅提取未解決的路徑、衝突區塊和簡潔差異，而非將整個檔案載入上下文。適用於合併、變基、挑選提交或 stash 彈出因衝突而中斷時，或當 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.