Resolve Git Conflicts

当 Git 合并或变基产生合并冲突需要解决时使用,通过 `git status` 显示未合并文件或代码中的冲突标记检测到

shenjingnan Updated 347 repo stars

File contents

shenjingnan/flashy commit ecfbba161b

Frequently asked questions

npx get-skill add shenjingnan/resolve-git-conflicts