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。

原文を見る