home/categories/git-workflows/vectorinstitute-aieng-bot-claude-skills-merge-resolution-skill-md
git-workflowsdevops

merge-resolution

Merge conflict resolution conventions. Use when resolving git merge conflicts, especially in dependency files and lock files.

VectorInstitute
maintainer
VectorInstitute
์—…๋ฐ์ดํŠธ๋จ 1/19/2026
์Šคํƒ€
0
ํฌํฌ
0
quick start

Installation and usage

Merge conflict resolution conventions. Use when resolving git merge conflicts, especially in dependency files and lock files.

์„ค์น˜
$ install --globalskills.sh
์‚ฌ์šฉ๋ฒ•

์„ค์น˜ ํ›„ ํ„ฐ๋ฏธ๋„์—์„œ ๋‹ค์Œ ๋ช…๋ น์„ ์‹คํ–‰ํ•˜์—ฌ ์ด ์Šคํ‚ฌ์„ ์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค:

skills use merge-resolution