git-workflowsdevops
merge-conflict-resolution
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files
maintainer
axiomantic
更新於 1/19/2026
星標
2
分支
0
quick start
Installation and usage
Use when git merge or rebase fails with conflicts, you see 'unmerged paths' or conflict markers (<<<<<<< =======), or need help resolving conflicted files
安裝
$ install --globalskills.sh
使用
安裝後，您可以通過在終端運行以下命令來使用此技能：
skills use merge-conflict-resolution