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。

查看原文