home/categories/git-workflows/ssiumha-dots-prompts-skills-git-conflict-skill-md
git-workflowsdevops

git-conflict

Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.

ssiumha
maintainer
ssiumha
업데이트됨 1/19/2026
스타
8
포크
0
quick start

Installation and usage

Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.

설치
$ install --globalskills.sh
사용법

설치 후 터미널에서 다음 명령을 실행하여 이 스킬을 사용할 수 있습니다:

skills use git-conflict