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:

Resuelva conflictos de fusión al actualizar SaaS Pegasus. Úselo cuando el usuario tenga conflictos de fusión después de ejecutar git merge durante una actualización de Pegasus, o cuando necesite ayuda con el proceso de fusión. Fuente: saaspegasus/pegasus-skills.

Ver original