Resolve Merge Conflicts Overview Resolve conflicts without opening full files unless the compact view is insufficient. Start with a summary, then inspect one conflicted file at a time. Workflow Start with a summary. python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains. Drill into one file. Show more
resolve-merge-conflicts
安装
npx skills add https://github.com/warpdotdev/common-skills --skill resolve-merge-conflicts