By vinvcn

resolving-merge-conflicts

ZH

vinvcn3.5k installs

Resolve Git conflicts with both sides in mind.

About this skill

Visibility: Public
Repository: vinvcn/mattpocock-skills-zh-cn
Language: Chinese
Supported agents: Codex
License: MIT (from GitHub repository)
Created: Oct 16, 2026
Updated: Oct 16, 2026
Files: 2