resolve-pegasus-conflicts

SKILL.md

This skill helps users resolve merge conflicts when upgrading their SaaS Pegasus codebase. Most users will invoke this skill when they have merge conflicts after merging their main branch into a Pegasus upgrade branch, but you can also help run the merge process for them.

First, determine what the user needs help with by checking their current state:

The user has already run git merge and has conflicts to resolve. Help them resolve the conflicts using these strategies:

SaaS Pegasus 업그레이드 시 병합 충돌을 해결합니다. Pegasus 업그레이드 중에 git merge를 실행한 후 사용자에게 병합 충돌이 발생하거나 병합 프로세스에 대한 도움이 필요할 때 사용하세요. 출처: saaspegasus/pegasus-skills.

원본 보기