resolve-pegasus-conflicts

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. يُستخدم عندما يواجه المستخدم تعارضات في عملية الدمج بعد تشغيل git merge أثناء ترقية Pegasus، أو عندما يحتاج إلى مساعدة في عملية الدمج. المصدر: saaspegasus/pegasus-skills.