git-workflowsdevops
git-conflict
Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.
maintainer
ssiumha
Updated 1/19/2026
Stars
8
Forks
0
quick start
Installation and usage
Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.
Installation
$ install --globalskills.sh
Usage
Once installed, you can use this skill by running the following command in your terminal:
skills use git-conflict