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。

查看原文