resolving-rollback-conflicts

What problem does it solve?

This Skill solves the critical issue of blocked rollback workflows caused by merge conflicts that occur when replaying git revert commits against a current base branch after an automated rollback process fails, eliminating the need for time-consuming manual conflict resolution that delays deployments and requires developer intervention.

Core Features & Use Cases

• Structured Conflict Resolution Workflow: Provides a step-by-step process to replay revert commits against the current base branch, identify target commit changes to undo, and preserve all later commit contributions to avoid breaking existing functionality.
• Edge Case Handling: Manages empty reverts (where target changes are already removed by later commits) and semantic reverts (where target changes have been transformed by later commits) with clear guardrails to avoid unintended edits.
• Use Case: When a CI/CD pipeline's automated rollback hits an unresolvable merge conflict, this Skill completes the rollback process end-to-end, ensuring the base branch is reverted to the intended state without manual developer work.

Quick Start

Invoke the resolving-rollback-conflicts skill when a git rollback fails with a merge conflict, providing the base branch name, failed commit SHA, and list of commits to revert to automatically resolve conflicts and produce a clean rollback branch.