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:

Lösen Sie Zusammenführungskonflikte beim Upgrade von SaaS Pegasus. Verwenden Sie diese Option, wenn der Benutzer Merge-Konflikte hat, nachdem er git merge während eines Pegasus-Upgrades ausgeführt hat, oder wenn er Hilfe beim Merge-Prozess benötigt. Quelle: saaspegasus/pegasus-skills.

Original anzeigen